diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11ca78106..12e73f1ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ Guide: https://keepachangelog.com/en/1.0.0/
 
 <!-- Add changes for active work here -->
 
+- [SearchUI] Update Maki icons to all SVG, latest versions from https://github.com/mapbox/maki
+- [SearchUI] Remove all custom Maki icons
 - [Unit Tests] Update and correct tests for iOS 17 using all mocked data.
 - [UI Tests] Update and correct tests for iOS 17 using all mocked data.
 - [Search] Rename `SearchEngine.reverseGeocoding` function to `SearchEngine.reverse`.
diff --git a/Sources/MapboxSearch/PublicAPI/Maki.swift b/Sources/MapboxSearch/PublicAPI/Maki.swift
index 6c60d2ca2..0064d4d5d 100644
--- a/Sources/MapboxSearch/PublicAPI/Maki.swift
+++ b/Sources/MapboxSearch/PublicAPI/Maki.swift
@@ -1,3 +1,6 @@
+// This file was generated by 'generate_maki.sh' script
+
+// swiftformat:disable:next redundantRawValues
 /// Represents static enumeration for all available icons in Mapbox [Maki icon set](https://github.com/mapbox/maki/).
 /// Kebab-case was replaced with camelCase.
 public enum Maki: String, CaseIterable, Codable {
@@ -13,6 +16,8 @@ public enum Maki: String, CaseIterable, Codable {
     case americanFootball = "american-football"
     /// Maki icon "amusement-park"
     case amusementPark = "amusement-park"
+    /// Maki icon "animal-shelter"
+    case animalShelter = "animal-shelter"
     /// Maki icon "aquarium"
     case aquarium
     /// Maki icon "arrow"
@@ -163,6 +168,8 @@ public enum Maki: String, CaseIterable, Codable {
     case gardenCentre = "garden-centre"
     /// Maki icon "garden"
     case garden
+    /// Maki icon "gate"
+    case gate
     /// Maki icon "gift"
     case gift
     /// Maki icon "globe"
@@ -183,6 +190,8 @@ public enum Maki: String, CaseIterable, Codable {
     case heliport
     /// Maki icon "highway-rest-area"
     case highwayRestArea = "highway-rest-area"
+    /// Maki icon "historic"
+    case historic
     /// Maki icon "home"
     case home
     /// Maki icon "horse-riding"
@@ -213,6 +222,8 @@ public enum Maki: String, CaseIterable, Codable {
     case laundry
     /// Maki icon "library"
     case library
+    /// Maki icon "lift-gate"
+    case liftGate = "lift-gate"
     /// Maki icon "lighthouse-JP"
     case lighthouseJp = "lighthouse-JP"
     /// Maki icon "lighthouse"
@@ -239,6 +250,8 @@ public enum Maki: String, CaseIterable, Codable {
     case music
     /// Maki icon "natural"
     case natural
+    /// Maki icon "nightclub"
+    case nightclub
     /// Maki icon "observation-tower"
     case observationTower = "observation-tower"
     /// Maki icon "optician"
@@ -251,6 +264,8 @@ public enum Maki: String, CaseIterable, Codable {
     case park
     /// Maki icon "parking-garage"
     case parkingGarage = "parking-garage"
+    /// Maki icon "parking-paid"
+    case parkingPaid = "parking-paid"
     /// Maki icon "parking"
     case parking
     /// Maki icon "pharmacy"
@@ -367,10 +382,14 @@ public enum Maki: String, CaseIterable, Codable {
     case telephone
     /// Maki icon "tennis"
     case tennis
+    /// Maki icon "terminal"
+    case terminal
     /// Maki icon "theatre"
     case theatre
     /// Maki icon "toilet"
     case toilet
+    /// Maki icon "toll"
+    case toll
     /// Maki icon "town-hall"
     case townHall = "town-hall"
     /// Maki icon "town"
@@ -379,6 +398,8 @@ public enum Maki: String, CaseIterable, Codable {
     case triangleStroked = "triangle-stroked"
     /// Maki icon "triangle"
     case triangle
+    /// Maki icon "tunnel"
+    case tunnel
     /// Maki icon "veterinary"
     case veterinary
     /// Maki icon "viewpoint"
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/Contents.json
deleted file mode 100644
index 73c00596a..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/Contents.json	
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/Contents.json
deleted file mode 100644
index 6e965652d..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/Contents.json	
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "provides-namespace" : true
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/Contents.json
deleted file mode 100644
index 908eb513b..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "car-repair-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "car-repair-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "car-repair-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24.png
deleted file mode 100644
index 63e52d697..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24@2x.png
deleted file mode 100644
index d18d8d253..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24@3x.png
deleted file mode 100644
index 54db1e3a8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/auto-repair.imageset/car-repair-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24.png
deleted file mode 100644
index 60f42e185..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24@2x.png
deleted file mode 100644
index 02996c6a3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24@3x.png
deleted file mode 100644
index c0247f738..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/ATM-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/Contents.json
deleted file mode 100644
index d98a40531..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bank.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ATM-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ATM-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ATM-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/Contents.json
deleted file mode 100644
index 28c2ed3d6..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "bar-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "bar-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "bar-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24.png
deleted file mode 100644
index e4e82be00..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24@2x.png
deleted file mode 100644
index 8510dcb29..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24@3x.png
deleted file mode 100644
index 59124f059..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bar.imageset/bar-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/Contents.json
deleted file mode 100644
index 7fefd9fbc..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "bus-11.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "bus-11@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "bus-11@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11.png
deleted file mode 100644
index fd3e2df31..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11@2x.png
deleted file mode 100644
index fddf1d9bd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11@3x.png
deleted file mode 100644
index 1f115c755..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/bus.imageset/bus-11@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/Contents.json
deleted file mode 100644
index 28c063390..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "cafe-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "cafe-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "cafe-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24.png
deleted file mode 100644
index 39f246b09..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24@2x.png
deleted file mode 100644
index f4d8ac9c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24@3x.png
deleted file mode 100644
index c42b5f9f3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cafe.imageset/cafe-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/Contents.json
deleted file mode 100644
index f7d06d94e..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "charging-station-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "charging-station-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "charging-station-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24.png
deleted file mode 100644
index 5087993ff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24@2x.png
deleted file mode 100644
index aed69b005..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24@3x.png
deleted file mode 100644
index aad91551b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/charging-station.imageset/charging-station-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/Contents.json
deleted file mode 100644
index 42e4ca876..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "cinema-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "cinema-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "cinema-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24.png
deleted file mode 100644
index e93f22c8c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24@2x.png
deleted file mode 100644
index fa4904f62..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24@3x.png
deleted file mode 100644
index c44082b02..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/cinema.imageset/cinema-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/Contents.json
deleted file mode 100644
index ec77fd3a1..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "clothing-store-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "clothing-store-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "clothing-store-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24.png
deleted file mode 100644
index 840eee7d8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24@2x.png
deleted file mode 100644
index 11b69b178..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24@3x.png
deleted file mode 100644
index 635678d7a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/clothing-store.imageset/clothing-store-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/Contents.json
deleted file mode 100644
index 875d3084f..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "emergency-phone-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "emergency-phone-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "emergency-phone-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24.png
deleted file mode 100644
index fa8f7e69b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24@2x.png
deleted file mode 100644
index 1dd9f2dcb..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24@3x.png
deleted file mode 100644
index 975072150..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/emergency-phone.imageset/emergency-phone-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/Contents.json
deleted file mode 100644
index b5deb0e42..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-twotone-fastfood.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ic-twotone-fastfood@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ic-twotone-fastfood@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood.png
deleted file mode 100644
index b50478397..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood@2x.png
deleted file mode 100644
index e03d6ab66..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood@3x.png
deleted file mode 100644
index 481a25462..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fast-food.imageset/ic-twotone-fastfood@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/Contents.json
deleted file mode 100644
index 84b426fdd..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "fitness-centre-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "fitness-centre-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "fitness-centre-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24.png
deleted file mode 100644
index 530bcd82c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24@2x.png
deleted file mode 100644
index e85b327ff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24@3x.png
deleted file mode 100644
index 4eb83dbce..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fitness-centre.imageset/fitness-centre-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/Contents.json
deleted file mode 100644
index 16ccfeadb..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-outline-local-gas-station.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ic-outline-local-gas-station@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ic-outline-local-gas-station@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station.png
deleted file mode 100644
index c359e6842..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station@2x.png
deleted file mode 100644
index 60ade3d7f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station@3x.png
deleted file mode 100644
index 04ecb7d2f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/fuel.imageset/ic-outline-local-gas-station@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Contents.json
deleted file mode 100644
index 03095664c..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Grocery-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Grocery-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Grocery-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24.png
deleted file mode 100644
index 1534b0ecc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24@2x.png
deleted file mode 100644
index 67b9bb82a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24@3x.png
deleted file mode 100644
index cd83b79a4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/grocery.imageset/Grocery-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/Contents.json
deleted file mode 100644
index 620c40572..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "home-12.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home-12@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home-12@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12.png
deleted file mode 100644
index b94f99336..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12@2x.png
deleted file mode 100644
index ffad06f91..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12@3x.png
deleted file mode 100644
index 984182a07..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/home.imageset/home-12@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/Contents.json
deleted file mode 100644
index b6a5a7c35..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "hospital-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "hospital-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "hospital-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24.png
deleted file mode 100644
index a5cd5fefb..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24@2x.png
deleted file mode 100644
index 0a7f6733c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24@3x.png
deleted file mode 100644
index f8b7b59a4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hospital.imageset/hospital-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Contents.json
deleted file mode 100644
index 6f5ffc4e3..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Hotel-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Hotel-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Hotel-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24.png
deleted file mode 100644
index 7c3416c20..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24@2x.png
deleted file mode 100644
index cdc1649fb..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24@3x.png
deleted file mode 100644
index 795b57432..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/hotel.imageset/Hotel-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/Contents.json
deleted file mode 100644
index f42a347ee..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "museum-11.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "museum-11@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "museum-11@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11.png
deleted file mode 100644
index 4ad40ed2c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11@2x.png
deleted file mode 100644
index 61eb1e0c6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11@3x.png
deleted file mode 100644
index ac50ecd03..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/museum.imageset/museum-11@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Contents.json
deleted file mode 100644
index 8cb869929..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Nightclub-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Nightclub-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Nightclub-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24.png
deleted file mode 100644
index 67498d796..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24@2x.png
deleted file mode 100644
index c6e5d38fc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24@3x.png
deleted file mode 100644
index 76701e399..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/nightclub.imageset/Nightclub-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/Contents.json
deleted file mode 100644
index 9f50a3795..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "park-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "park-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "park-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24.png
deleted file mode 100644
index e2e77a006..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24@2x.png
deleted file mode 100644
index a28fc55ee..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24@3x.png
deleted file mode 100644
index 067cd6238..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/park.imageset/park-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Contents.json
deleted file mode 100644
index 994ef058d..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Parking-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Parking-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Parking-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24.png
deleted file mode 100644
index 105b07477..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24@2x.png
deleted file mode 100644
index e9666c865..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24@3x.png
deleted file mode 100644
index 540b6fb95..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/parking.imageset/Parking-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/Contents.json
deleted file mode 100644
index 6a71ef93e..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "pharmacy-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pharmacy-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pharmacy-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24.png
deleted file mode 100644
index fb4eee37b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24@2x.png
deleted file mode 100644
index e1caae2c3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24@3x.png
deleted file mode 100644
index 92ab95ae5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/pharmacy.imageset/pharmacy-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/Contents.json
deleted file mode 100644
index 63f26ae5e..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "rail-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "rail-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "rail-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24.png
deleted file mode 100644
index f6f42600f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24@2x.png
deleted file mode 100644
index 6173c2c1d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24@3x.png
deleted file mode 100644
index 6b94f12fd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/rail.imageset/rail-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/Contents.json
deleted file mode 100644
index 737df1287..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "restaurant-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "restaurant-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "restaurant-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24.png
deleted file mode 100644
index 657c41809..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24@2x.png
deleted file mode 100644
index 7489044a1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24@3x.png
deleted file mode 100644
index 4b6b0cef6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/restaurant.imageset/restaurant-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Contents.json
deleted file mode 100644
index 7b40aa774..000000000
--- a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Contents.json	
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Shopping malls-24.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Shopping malls-24@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Shopping malls-24@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24.png
deleted file mode 100644
index 222ba0452..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24@2x.png
deleted file mode 100644
index 5e684b4d4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24@3x.png
deleted file mode 100644
index 880ee3086..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/shop.imageset/Shopping malls-24@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/Contents.json
index 6e965652d..73c00596a 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/Contents.json
@@ -2,8 +2,5 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "provides-namespace" : true
   }
 }
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/Contents.json
index e51a1efdd..07557a80d 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"aerialway@1x.png","idiom":"universal","scale":"1x"},{"filename":"aerialway@2x.png","idiom":"universal","scale":"2x"},{"filename":"aerialway@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"aerialway.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway.svg
new file mode 100644
index 000000000..e312bf917
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="aerialway" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13,5H8V2.6c0.1854-0.1047,0.3325-0.2659,0.42-0.46L13.5,1.5C13.7761,1.5,14,1.2761,14,1s-0.2239-0.5-0.5-0.5L8.28,1.15&#xA;&#x9;C8.0954,0.9037,7.8077,0.7562,7.5,0.75C7.0963,0.752,6.7334,0.9966,6.58,1.37L1.5,2C1.2239,2,1,2.2239,1,2.5S1.2239,3,1.5,3&#xA;&#x9;l5.22-0.65C6.7967,2.4503,6.8917,2.5351,7,2.6V5H2C1.4477,5,1,5.4477,1,6v7c0,0.5523,0.4477,1,1,1h11c0.5523,0,1-0.4477,1-1V6&#xA;&#x9;C14,5.4477,13.5523,5,13,5z M7,11H3V7h4V11z M12,11H8V7h4V11z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@1x.png
deleted file mode 100644
index f6284404f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@2x.png
deleted file mode 100644
index 1907ae0e8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@3x.png
deleted file mode 100644
index fcb437737..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/aerialway.imageset/aerialway@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/Contents.json
index 021f699c7..b59af4dfb 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"airfield@1x.png","idiom":"universal","scale":"1x"},{"filename":"airfield@2x.png","idiom":"universal","scale":"2x"},{"filename":"airfield@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"airfield.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield.svg
new file mode 100644
index 000000000..f322496cf
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="airfield" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path5" d="M6.8182,0.6818H4.7727&#xA;&#x9;C4.0909,0.6818,4.0909,0,4.7727,0h5.4545c0.6818,0,0.6818,0.6818,0,0.6818H8.1818c0,0,0.8182,0.5909,0.8182,1.9545V4h6v2L9,8l-0.5,5&#xA;&#x9;l2.5,1.3182V15H4v-0.6818L6.5,13L6,8L0,6V4h6V2.6364C6,1.2727,6.8182,0.6818,6.8182,0.6818z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@1x.png
deleted file mode 100644
index b0760d3f4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@2x.png
deleted file mode 100644
index b7747ef88..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@3x.png
deleted file mode 100644
index dce7c116d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/airfield.imageset/airfield@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/Contents.json
index 3ec6b5111..1dea590b6 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"airport@1x.png","idiom":"universal","scale":"1x"},{"filename":"airport@2x.png","idiom":"universal","scale":"2x"},{"filename":"airport@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"airport.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport.svg
new file mode 100644
index 000000000..3095aacf2
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="airport" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path7712-0" d="M15,6.8182L15,8.5l-6.5-1&#xA;&#x9;l-0.3182,4.7727L11,14v1l-3.5-0.6818L4,15v-1l2.8182-1.7273L6.5,7.5L0,8.5V6.8182L6.5,4.5v-3c0,0,0-1.5,1-1.5s1,1.5,1,1.5v2.8182&#xA;&#x9;L15,6.8182z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@1x.png
deleted file mode 100644
index dbc923200..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@2x.png
deleted file mode 100644
index 40465b2b8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@3x.png
deleted file mode 100644
index 08d53e1e6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/airport.imageset/airport@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/Contents.json
index 1dc390894..1bb353a16 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"alcohol-shop@1x.png","idiom":"universal","scale":"1x"},{"filename":"alcohol-shop@2x.png","idiom":"universal","scale":"2x"},{"filename":"alcohol-shop@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"alcohol-shop.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop.svg
new file mode 100644
index 000000000..54f4d3e26
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="alcohol-shop" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M14,4h-4v3.44l0,0c0,0,0,0,0,0.06c0.003,0.9096,0.6193,1.7026,1.5,1.93V13H11c-0.2761,0-0.5,0.2239-0.5,0.5&#xA;&#x9;S10.7239,14,11,14h2c0.2761,0,0.5-0.2239,0.5-0.5S13.2761,13,13,13h-0.5V9.43c0.8807-0.2274,1.497-1.0204,1.5-1.93c0,0,0,0,0-0.06&#xA;&#x9;l0,0V4z M13,7.5c0,0.5523-0.4477,1-1,1s-1-0.4477-1-1V5h2V7.5z M5.5,2.5V2C5.7761,2,6,1.7761,6,1.5S5.7761,1,5.5,1V0.5&#xA;&#x9;C5.5,0.2239,5.2761,0,5,0H4C3.7239,0,3.5,0.2239,3.5,0.5V1C3.2239,1,3,1.2239,3,1.5S3.2239,2,3.5,2v0.5C3.5,3.93,1,5.57,1,7v6&#xA;&#x9;c0,0.5523,0.4477,1,1,1h5c0.5318-0.0465,0.9535-0.4682,1-1V7C8,5.65,5.5,3.85,5.5,2.5z M4.5,12C3.1193,12,2,10.8807,2,9.5&#xA;&#x9;S3.1193,7,4.5,7S7,8.1193,7,9.5S5.8807,12,4.5,12z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@1x.png
deleted file mode 100644
index 29c4a92da..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@2x.png
deleted file mode 100644
index c59fa1dd0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@3x.png
deleted file mode 100644
index 1eb6314c4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/alcohol-shop.imageset/alcohol-shop@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/Contents.json
index 37a7aecc1..9c5841e56 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"american-football@1x.png","idiom":"universal","scale":"1x"},{"filename":"american-football@2x.png","idiom":"universal","scale":"2x"},{"filename":"american-football@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"american-football.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football.svg
new file mode 100644
index 000000000..236c290b7
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="american-football" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M7.53,3C3.09,3,1,7.5,1,7.5S3.09,12,7.53,12S14,7.5,14,7.5S12,3,7.53,3z M11,7v1.5C11,8.7761,10.7761,9,10.5,9&#xA;&#x9;S10,8.7761,10,8.5V8H8v0.5C8,8.7761,7.7761,9,7.5,9S7,8.7761,7,8.5V8H5v0.5C5,8.7761,4.7761,9,4.5,9S4,8.7761,4,8.5v-2&#xA;&#x9;C4,6.2239,4.2239,6,4.5,6S5,6.2239,5,6.5V7h2V6.5C7,6.2239,7.2239,6,7.5,6S8,6.2239,8,6.5V7h2V6.5C10,6.2239,10.2239,6,10.5,6&#xA;&#x9;S11,6.2239,11,6.5V7z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@1x.png
deleted file mode 100644
index f0bf4bb4a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@2x.png
deleted file mode 100644
index ceff7862d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@3x.png
deleted file mode 100644
index 92e8f4eec..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/american-football.imageset/american-football@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/Contents.json
index 87344c9f5..2209b9510 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"amusement-park@1x.png","idiom":"universal","scale":"1x"},{"filename":"amusement-park@2x.png","idiom":"universal","scale":"2x"},{"filename":"amusement-park@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"amusement-park.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park.svg
new file mode 100644
index 000000000..4fc4fbbbc
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="amusement-park">
+  <path d="M13.5 7C13.5 9.02798 12.4939 10.821 10.9535 11.907L12 13.9999H3L4.04645 11.907C2.50613 10.821 1.5 9.02798 1.5 7C1.5 3.68629 4.18629 1 7.5 1C10.8137 1 13.5 3.68629 13.5 7ZM12.2984 7.125H8.99487C8.96844 7.4453 8.84138 7.73706 8.64538 7.96861L10.9814 10.3046C11.7719 9.47202 12.2669 8.35614 12.2984 7.125ZM10.8046 10.4814L8.46861 8.14538C8.33136 8.26156 8.17296 8.35351 8 8.41465V11.7743C9.08206 11.6623 10.0574 11.1908 10.8046 10.4814ZM6.00513 7.125H2.7016C2.73307 8.35614 3.2281 9.47202 4.01864 10.3046L6.35462 7.96861C6.15862 7.73706 6.03156 7.4453 6.00513 7.125ZM4.19542 10.4814C4.94259 11.1908 5.91794 11.6623 7 11.7743V8.41465C6.82704 8.35351 6.66864 8.26156 6.53139 8.14538L4.19542 10.4814ZM12.2984 6.875C12.2669 5.64386 11.7719 4.52798 10.9814 3.69542L8.64538 6.03139C8.84138 6.26294 8.96844 6.5547 8.99487 6.875H12.2984ZM10.8046 3.51864C9.97202 2.7281 8.85614 2.23307 7.625 2.2016V5.50513C7.9453 5.53156 8.23706 5.65862 8.46861 5.85462L10.8046 3.51864ZM7.375 5.50513V2.2016C6.14386 2.23307 5.02798 2.7281 4.19542 3.51864L6.53139 5.85462C6.76294 5.65862 7.0547 5.53156 7.375 5.50513ZM6.35462 6.03139L4.01864 3.69542C3.2281 4.52798 2.73307 5.64386 2.7016 6.875H6.00513C6.03156 6.5547 6.15862 6.26294 6.35462 6.03139Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@1x.png
deleted file mode 100644
index 129709027..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@2x.png
deleted file mode 100644
index dec1f0657..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@3x.png
deleted file mode 100644
index 085acbe5e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/amusement-park.imageset/amusement-park@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/animal-shelter.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/animal-shelter.imageset/Contents.json
new file mode 100644
index 000000000..ba83f82af
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/animal-shelter.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"animal-shelter.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/animal-shelter.imageset/animal-shelter.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/animal-shelter.imageset/animal-shelter.svg
new file mode 100644
index 000000000..57dfb0cb2
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/animal-shelter.imageset/animal-shelter.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="animal-shelter" width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 7.528,0.895 9,2 h 1 L 11.473,0.896 C 11.689502,0.73373378 12,0.8884387 12,1.159 V 4.5 c 0,0.722 -0.522,1.184 -1,1.573 V 10 l 0.8,2.4 0.706,0.353 c 0.302922,0.151551 0.494181,0.461283 0.494,0.8 C 13,13.8 12.8,14 12.553,14 H 4.25 C 3.017,14 2,13 2,11.713 2,9.5424588 2.4530836,7.9300225 2.745,6.845 2.8910836,6.3020225 3.0352907,5.8946079 3.138,5.614 3.1956028,5.4566256 3.253276,5.3110749 3.33,5.165 3.7788405,4.3104525 5.0743666,4.9556117 4.672,5.833 4.6232251,5.9393571 4.5778358,6.0512046 4.539,6.15 4.4477518,6.3821288 4.325004,6.7430011 4.193,7.234 3.947004,8.1490011 3.674,9.521 3.558,11.367 3.926,9.307 5.98,7.239 7.635,5.758 7.29,5.432 7.001,5.038 7.001,4.5 l 0,-3.342 c 0,-0.2705613 0.3106215,-0.42543084 0.527,-0.263 z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/Contents.json
index 44e33364f..58c0441d5 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"aquarium@1x.png","idiom":"universal","scale":"1x"},{"filename":"aquarium@2x.png","idiom":"universal","scale":"2x"},{"filename":"aquarium@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"aquarium.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium.svg
new file mode 100644
index 000000000..fb611ee71
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="aquarium">
+  <path d="M1.13505 8.57743C1.98919 6.14741 4.72075 2 10 2C12.6518 2 14 3 14 3C14 3 11.6865 3 10.6203 3.44512C10.54 3.47864 10.4747 3.53744 10.4329 3.61375C10.2432 3.95995 9.75252 5.04744 10.3231 6.19506C10.4172 6.38427 10.6364 6.46548 10.8383 6.40312C11.3474 6.24589 12.3301 5.89727 13.0761 5.35729C13.2973 5.1972 13.615 5.25773 13.6797 5.52298C13.9401 6.59045 13.9401 8.40955 13.6797 9.47702C13.615 9.74227 13.2973 9.8028 13.0761 9.64271C12.3301 9.10273 11.3474 8.75411 10.8383 8.59688C10.6364 8.53452 10.4172 8.61573 10.3231 8.80494C9.75252 9.95256 10.2432 11.04 10.4329 11.3863C10.4747 11.4626 10.54 11.5214 10.6203 11.5549C11.6865 12 14 12 14 12C13.5 12.3333 11.8 13 9.00001 13C4.51722 13 2.02736 10.3427 1.25972 9.35985C1.08546 9.13673 1.04117 8.84452 1.13505 8.57743ZM5.00001 9C5.69037 9 6.25001 8.44036 6.25001 7.75C6.25001 7.05964 5.69037 6.5 5.00001 6.5C4.30966 6.5 3.75001 7.05964 3.75001 7.75C3.75001 8.44036 4.30966 9 5.00001 9Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@1x.png
deleted file mode 100644
index 6f584652b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@2x.png
deleted file mode 100644
index 3b42388c5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@3x.png
deleted file mode 100644
index 69faa6ccb..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/aquarium.imageset/aquarium@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/Contents.json
index 4bc73bd92..7d00b2242 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"arrow@1x.png","idiom":"universal","scale":"1x"},{"filename":"arrow@2x.png","idiom":"universal","scale":"2x"},{"filename":"arrow@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"arrow.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow.svg
new file mode 100644
index 000000000..ab590fd99
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="arrow">
+  <path d="M8.29289 2.29289C8.68342 1.90237 9.31658 1.90237 9.70711 2.29289L14.2071 6.79289C14.5976 7.18342 14.5976 7.81658 14.2071 8.20711L9.70711 12.7071C9.31658 13.0976 8.68342 13.0976 8.29289 12.7071C7.90237 12.3166 7.90237 11.6834 8.29289 11.2929L11 8.5H1.5C0.947715 8.5 0.5 8.05228 0.5 7.5C0.5 6.94772 0.947715 6.5 1.5 6.5H11L8.29289 3.70711C7.90237 3.31658 7.90237 2.68342 8.29289 2.29289Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@1x.png
deleted file mode 100644
index b161277d8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@2x.png
deleted file mode 100644
index 17a4f9d49..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@3x.png
deleted file mode 100644
index f7fb85445..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/arrow.imageset/arrow@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/Contents.json
index b388675d6..9b530b764 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"art-gallery@1x.png","idiom":"universal","scale":"1x"},{"filename":"art-gallery@2x.png","idiom":"universal","scale":"2x"},{"filename":"art-gallery@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"art-gallery.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery.svg
new file mode 100644
index 000000000..6a5c6a102
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="art-gallery">
+  <path d="m10.71 3-2.86-2.849996c-.1945-.1960996-.511-.1973996-.7071-.0029-.001.001-.0019.0019-.0029.0029l-2.85 2.849996h-2.79c-.2761 0-.5.2239-.5.5v9c0 .2761.2239.5.5.5h12c.2761 0 .5-.2239.5-.5v-9c0-.2761-.2239-.5-.5-.5zm-3.21-1.79 1.79 1.79h-3.58zm5.5 10.79h-11v-8h11zm-8-5c-.5523 0-1-.4477-1-1s.4477-1 1-1 1 .4477 1 1-.4477 1-1 1zm7 4h-7.5l1.5-3 1.25 2.5 2.25-4.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@1x.png
deleted file mode 100644
index 2235bbe46..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@2x.png
deleted file mode 100644
index 9abc01161..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@3x.png
deleted file mode 100644
index 543435d1d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/art-gallery.imageset/art-gallery@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/Contents.json
index 21fa82e14..83d771a90 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"attraction@1x.png","idiom":"universal","scale":"1x"},{"filename":"attraction@2x.png","idiom":"universal","scale":"2x"},{"filename":"attraction@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"attraction.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction.svg
new file mode 100644
index 000000000..f5d467e3c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="attraction" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect7143" d="M6,2C5.446,2,5.2478,2.5045,5,3L4.5,4h-2C1.669,4,1,4.669,1,5.5v5C1,11.331,1.669,12,2.5,12h10&#xA;&#x9;c0.831,0,1.5-0.669,1.5-1.5v-5C14,4.669,13.331,4,12.5,4h-2L10,3C9.75,2.5,9.554,2,9,2H6z M2.5,5C2.7761,5,3,5.2239,3,5.5&#xA;&#x9;S2.7761,6,2.5,6S2,5.7761,2,5.5S2.2239,5,2.5,5z M7.5,5c1.6569,0,3,1.3431,3,3s-1.3431,3-3,3s-3-1.3431-3-3S5.8431,5,7.5,5z&#xA;&#x9; M7.5,6.5C6.6716,6.5,6,7.1716,6,8l0,0c0,0.8284,0.6716,1.5,1.5,1.5l0,0C8.3284,9.5,9,8.8284,9,8l0,0C9,7.1716,8.3284,6.5,7.5,6.5&#xA;&#x9;L7.5,6.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@1x.png
deleted file mode 100644
index eee688217..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@2x.png
deleted file mode 100644
index e143b7306..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@3x.png
deleted file mode 100644
index c131f5309..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/attraction.imageset/attraction@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/Contents.json
index ab031f05f..d1cb2329a 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"bakery@1x.png","idiom":"universal","scale":"1x"},{"filename":"bakery@2x.png","idiom":"universal","scale":"2x"},{"filename":"bakery@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"bakery.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery.svg
new file mode 100644
index 000000000..2a00e88c2
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="bakery">
+  <path d="M5.294,4.382,6,9.5a.979.979,0,0,0,1,1H8a.979.979,0,0,0,1-1l.706-5.118C9.706,3,7.5,3,7.5,3S5.291,3,5.294,4.382ZM3.5,5C2,5,2,6,2,6l1,4H4.5a.793.793,0,0,0,.794-.765L4.5,5Zm-2,2.5a1.533,1.533,0,0,0-1.059.412A1.366,1.366,0,0,0,0,8.794V11H.882A1.02,1.02,0,0,0,2,10ZM11.5,5C13,5,13,6,13,6l-1,4H10.5a.793.793,0,0,1-.794-.765L10.5,5Zm2,2.5a1.533,1.533,0,0,1,1.059.412A1.366,1.366,0,0,1,15,8.794V11h-.882A1.02,1.02,0,0,1,13,10Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@1x.png
deleted file mode 100644
index bed2710ff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@2x.png
deleted file mode 100644
index efc6eab4f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@3x.png
deleted file mode 100644
index 50886fb4e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bakery.imageset/bakery@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/Contents.json
index ea46a5147..7f9a9aaa1 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"bank-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"bank-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"bank-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"bank-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP.svg
new file mode 100644
index 000000000..dbaeae2d9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bank-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.2808,3.3763l-2.9,3.625H11.25a.75.75,0,0,1,0,1.5H8.5v1h2.75a.75.75,0,0,1,0,1.5H8.5v1.25a1,1,0,0,1-2,0v-1.25H3.75a.75.75,0,1,1,0-1.5H6.5v-1H3.75a.75.75,0,0,1,0-1.5H5.6193l-2.9-3.625A1,1,0,0,1,4.2771,2.1216l.0037.0047L7.5,6.15l3.2192-4.024a1,1,0,0,1,1.5653,1.2453Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@1x.png
deleted file mode 100644
index 02f63834d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@2x.png
deleted file mode 100644
index 7b9c5cc96..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@3x.png
deleted file mode 100644
index 4122ead90..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank-JP.imageset/bank-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank.imageset/Contents.json
new file mode 100644
index 000000000..a29c45785
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"bank.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bank.imageset/bank.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank.imageset/bank.svg
new file mode 100644
index 000000000..592f5fd0f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bank.imageset/bank.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="bank" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect5668" d="M1,3C0.446,3,0,3.446,0,4v7c0,0.554,0.446,1,1,1h13c0.554,0,1-0.446,1-1V4c0-0.554-0.446-1-1-1H1z M1,4h1.5&#xA;&#x9;C2.7761,4,3,4.2239,3,4.5S2.7761,5,2.5,5S2,4.7761,2,4.5L1.5,5C1.7761,5,2,5.2239,2,5.5S1.7761,6,1.5,6S1,5.7761,1,5.5V4z M7.5,4&#xA;&#x9;C8.8807,4,10,5.567,10,7.5l0,0C10,9.433,8.8807,11,7.5,11S5,9.433,5,7.5S6.1193,4,7.5,4z M12.5,4H14v1.5C14,5.7761,13.7761,6,13.5,6&#xA;&#x9;S13,5.7761,13,5.5S13.2239,5,13.5,5L13,4.5C13,4.7761,12.7761,5,12.5,5S12,4.7761,12,4.5S12.2239,4,12.5,4z M7.5,5.5&#xA;&#x9;c-0.323,0-0.5336,0.1088-0.6816,0.25h1.3633C8.0336,5.6088,7.823,5.5,7.5,5.5z M6.625,6C6.5795,6.091,6.5633,6.1711,6.5449,6.25&#xA;&#x9;h1.9102C8.4367,6.1711,8.4205,6.091,8.375,6H6.625z M6.5,6.5v0.25h2V6.5H6.5z M6.5,7v0.25h2V7H6.5z M6.5,7.5v0.25h2V7.5H6.5z M6.5,8&#xA;&#x9;L6.25,8.25h2L8.5,8H6.5z M6,8.5c0,0,0.0353,0.1024,0.1016,0.25H8.375L8,8.5H6z M1.5,9C1.7761,9,2,9.2239,2,9.5S1.7761,10,1.5,10&#xA;&#x9;L2,10.5C2,10.2239,2.2239,10,2.5,10S3,10.2239,3,10.5S2.7761,11,2.5,11H1V9.5C1,9.2239,1.2239,9,1.5,9z M6.2383,9&#xA;&#x9;C6.2842,9.0856,6.3144,9.159,6.375,9.25h2.2676C8.7092,9.1121,8.75,9,8.75,9H6.2383z M13.5,9C13.7761,9,14,9.2239,14,9.5V11h-1.5&#xA;&#x9;c-0.2761,0-0.5-0.2239-0.5-0.5s0.2239-0.5,0.5-0.5s0.5,0.2239,0.5,0.5l0.5-0.5C13.2239,10,13,9.7761,13,9.5S13.2239,9,13.5,9z&#xA;&#x9; M6.5664,9.5c0.0786,0.0912,0.1647,0.1763,0.2598,0.25h1.4199C8.3462,9.6727,8.4338,9.5883,8.5,9.5H6.5664z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bar.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bar.imageset/Contents.json
new file mode 100644
index 000000000..53415dd03
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bar.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"bar.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bar.imageset/bar.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bar.imageset/bar.svg
new file mode 100644
index 000000000..95d33804c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bar.imageset/bar.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="bar" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path4" d="M7.5,1c-2,0-7,0.25-6.5,0.75L7,8v4&#xA;&#x9;c0,1-3,0.5-3,2h7c0-1.5-3-1-3-2V8l6-6.25C14.5,1.25,9.5,1,7.5,1z M7.5,2c2.5,0,4.75,0.25,4.75,0.25L11.5,3h-8L2.75,2.25&#xA;&#x9;C2.75,2.25,5,2,7.5,2z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/Contents.json
index 12c396c8d..1e34854d9 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"barrier@1x.png","idiom":"universal","scale":"1x"},{"filename":"barrier@2x.png","idiom":"universal","scale":"2x"},{"filename":"barrier@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"barrier.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier.svg
new file mode 100644
index 000000000..d85b79ae4
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="barrier">
+  <path d="m13 2h-11c-.26522 0-.51957.10536-.70711.29289-.18753.18754-.29289.44189-.29289.70711v6c0 .26522.10536.51957.29289.70711.18754.18753.44189.29289.70711.29289h1v2.5c0 .1326.05268.2598.14645.3536.09376.0937.22094.1464.35355.1464s.25979-.0527.35355-.1464c.09377-.0938.14645-.221.14645-.3536v-.5h7v.5c0 .1326.0527.2598.1464.3536.0938.0937.221.1464.3536.1464s.2598-.0527.3536-.1464c.0937-.0938.1464-.221.1464-.3536v-2.5h1c.2652 0 .5196-.10536.7071-.29289.1875-.18754.2929-.44189.2929-.70711v-6c0-.26522-.1054-.51957-.2929-.70711-.1875-.18753-.4419-.29289-.7071-.29289zm0 1v2l-2-2zm-3.5 0 3.5 3.5v2.5l-6-6zm-4 6-3.5-3.5v-2.5l6 6zm-3.5 0v-2l2 2zm9 2h-7v-1h7zm-.207-2h-1.293l-6-6h2l6 6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@1x.png
deleted file mode 100644
index 853c88377..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@2x.png
deleted file mode 100644
index c8b17d65c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@3x.png
deleted file mode 100644
index e9e6ab709..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/barrier.imageset/barrier@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/Contents.json
index b1ab9c28f..c07c367b7 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"baseball@1x.png","idiom":"universal","scale":"1x"},{"filename":"baseball@2x.png","idiom":"universal","scale":"2x"},{"filename":"baseball@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"baseball.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball.svg
new file mode 100644
index 000000000..a9b76e7a4
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="baseball">
+  <path d="m9.00003 3.5c0 .8284-.6716 1.5-1.5 1.5s-1.5-.6716-1.5-1.5.6716-1.5 1.5-1.5 1.5.6716 1.5 1.5zm-3-3.22c0-.1546-.1254-.28-.28-.28-.0979.0262-.1852.0821-.25.16l-2.47 4.43c-.0059.0431-.0059.0869 0 .13 0 .1546.1254.28.28.28.1015-.0243.1926-.0803.26-.16l2.46-4.43c.006-.0431.006-.0869 0-.13zm5.89997 13.92-2.89997-7.81c-.0474-.2273-.2478-.3901-.48-.39h-5c-.2761 0-.5.2239-.5.5s.2239.5.5.5h2.48l1.45 2.51-4.27 4.61c-.1141.0932-.1802.2327-.18.38 0 .2761.2239.5.5.5.1224-.0006.2401-.047.33-.13l4.45-4.15 2.75997 4c.0895.1592.2574.2584.44.26.2796.0002.5092-.2207.52-.5-.0042-.1013-.039-.199-.1-.28z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@1x.png
deleted file mode 100644
index c6b17d898..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@2x.png
deleted file mode 100644
index 025899cac..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@3x.png
deleted file mode 100644
index 7034f4733..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/baseball.imageset/baseball@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/Contents.json
index 22437ec9d..8b4507593 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"basketball@1x.png","idiom":"universal","scale":"1x"},{"filename":"basketball@2x.png","idiom":"universal","scale":"2x"},{"filename":"basketball@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"basketball.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball.svg
new file mode 100644
index 000000000..385ba4831
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="basketball">
+  <path d="M3.66001 7H2.03C2.11012 6.02077 2.45969 5.05281 3.04001 4.26C3.39039 5.12432 3.59972 6.0693 3.66001 7ZM4.73501 7H7V2C5.78985 2.1061 4.72468 2.61284 3.83501 3.44C4.36491 4.54578 4.67079 5.77549 4.73501 7ZM8 2V7H10.265C10.3292 5.77549 10.6351 4.54578 11.165 3.44C10.2753 2.61284 9.21014 2.1061 8 2ZM11.96 4.26C11.6096 5.12432 11.4003 6.0693 11.34 7H12.97C12.8899 6.02077 12.5403 5.05281 11.96 4.26ZM14 8.49919C14 8.77489 13.7765 8.99838 13.5008 8.99838H11.72L10.96 10.5184V12.8984C10.9578 12.9736 10.934 13.0466 10.8915 13.1087C10.8489 13.1707 10.7894 13.2192 10.72 13.2484C10.6743 13.2607 10.6273 13.2674 10.58 13.2684C10.5312 13.2706 10.4825 13.2619 10.4375 13.2428C10.3925 13.2238 10.3524 13.195 10.32 13.1584L9.3 12.1484L7.71 13.2084C7.64698 13.2476 7.57423 13.2684 7.5 13.2684C7.42577 13.2684 7.35303 13.2476 7.29 13.2084L5.7 12.1484L4.68 13.1584C4.62956 13.211 4.56471 13.2477 4.49357 13.2637C4.42243 13.2797 4.34814 13.2744 4.28 13.2484C4.21063 13.2192 4.1511 13.1707 4.10854 13.1087C4.06599 13.0466 4.04219 12.9736 4.04 12.8984V10.5184L3.28 8.99838H1.49919C1.2235 8.99838 1 8.77489 1 8.4992C0.999998 8.2235 1.22349 8 1.49919 8H13.5008C13.7765 8 14 8.2235 14 8.49919ZM6.86 8.99838H4.12L4.75 10.2684C4.7772 10.3173 4.791 10.3725 4.79 10.4284V11.9884L5.35 11.4384L6.86 8.99838ZM8.84 11.5484L7.5 9.38838L6.16 11.5484L7.5 12.4484L8.84 11.5484ZM10.89 8.99838H8.14L9.65 11.4384L10.21 11.9884V10.4284C10.209 10.3725 10.2228 10.3173 10.25 10.2684L10.89 8.99838Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@1x.png
deleted file mode 100644
index 2eb70509f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@2x.png
deleted file mode 100644
index c69ca1225..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@3x.png
deleted file mode 100644
index 2d86d2cbd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/basketball.imageset/basketball@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/Contents.json
index 72970e550..8f09e3f82 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"bbq@1x.png","idiom":"universal","scale":"1x"},{"filename":"bbq@2x.png","idiom":"universal","scale":"2x"},{"filename":"bbq@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"bbq.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq.svg
new file mode 100644
index 000000000..c540b7d69
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bbq" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M9.32,7.655C10.8782,7.108,11.9471,5.6506,12,4H3c0.053,1.6299,1.0978,3.0728,2.63,3.631L4.923,9.044&#xA;&#x9;c-1.3571-0.2355-2.6482,0.6737-2.8837,2.0308s0.6737,2.6482,2.0308,2.8837C4.9927,14.1187,5.9273,13.7485,6.49,13h4.223l0.335,0.717&#xA;&#x9;c0.0836,0.1735,0.2594,0.2836,0.452,0.283c0.0733,0.0003,0.1457-0.0158,0.212-0.047c0.2497-0.117,0.3575-0.4141,0.241-0.664&#xA;&#x9;L9.32,7.655z M4.5,12.75c-0.6904,0-1.25-0.5596-1.25-1.25s0.5596-1.25,1.25-1.25s1.25,0.5596,1.25,1.25&#xA;&#x9;C5.7484,12.1897,5.1897,12.7484,4.5,12.75z M6.95,12c0.2066-1.007-0.2268-2.0374-1.091-2.594L6.6,7.923&#xA;&#x9;c0.577,0.1042,1.168,0.1042,1.745,0l1.9,4.07L6.95,12z M4.75,1C4.6119,1,4.5,1.1119,4.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1&#xA;&#x9;C3,2.8881,3.1119,3,3.25,3S3.5,2.8881,3.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C5,1.1119,4.8881,1,4.75,1z M6.75,1&#xA;&#x9;C6.6119,1,6.5,1.1119,6.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C5,2.8881,5.1119,3,5.25,3S5.5,2.8881,5.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C7,1.1119,6.8881,1,6.75,1z M8.75,1C8.6119,1,8.5,1.1119,8.5,1.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C7,2.8881,7.1119,3,7.25,3S7.5,2.8881,7.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C9,1.1119,8.8881,1,8.75,1z M10.75,1&#xA;&#x9;c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C9,2.8881,9.1119,3,9.25,3S9.5,2.8881,9.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C11,1.1119,10.8881,1,10.75,1z M12.75,1c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C11,2.8881,11.1119,3,11.25,3s0.25-0.1119,0.25-0.25c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C13,1.1119,12.8881,1,12.75,1z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@1x.png
deleted file mode 100644
index 78aeab63f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@2x.png
deleted file mode 100644
index ef9c76531..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@3x.png
deleted file mode 100644
index f0ba87a3e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bbq.imageset/bbq@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/Contents.json
index 46141dc65..4a77c56ba 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"beach@1x.png","idiom":"universal","scale":"1x"},{"filename":"beach@2x.png","idiom":"universal","scale":"2x"},{"filename":"beach@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"beach.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach.svg
new file mode 100644
index 000000000..5e08cd2c5
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="beach" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M5.3608,1.67l-.01,4.02a4.4523,4.4523,0,0,0-1.1-.11c-.37.1-.74.63-1.1.76A4.2019,4.2019,0,0,1,5.3608,1.67Zm2.41-.64,2.03,3.45a3.1832,3.1832,0,0,1,.84-.61c.36-.1.94.17,1.34.11A4.2018,4.2018,0,0,0,7.7708,1.03ZM1.0008,13h13c-.66-.66-2.64-1.11-4.34-1.33l-1.87-7c.52-.05,1.15.03,1.53,0l-2.11-3.6h-.01a6.1743,6.1743,0,0,0-.7.14,4.3792,4.3792,0,0,0-.64.22l-.01,4.15c.35-.17.84-.54,1.3-.74l1.8,6.74c-.58-.05-1.09-.08-1.45-.08C6.0308,11.5,2.0008,12,1.0008,13Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@1x.png
deleted file mode 100644
index aa7604faf..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@2x.png
deleted file mode 100644
index f3993d653..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@3x.png
deleted file mode 100644
index fda92f560..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/beach.imageset/beach@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/Contents.json
index 429e02de4..47b5be98f 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"beer@1x.png","idiom":"universal","scale":"1x"},{"filename":"beer@2x.png","idiom":"universal","scale":"2x"},{"filename":"beer@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"beer.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer.svg
new file mode 100644
index 000000000..c5e8357c9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="beer" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12,5V2c0,0-1-1-4.5-1S3,2,3,2v3c0.0288,1.3915,0.3706,2.7586,1,4c0.6255,1.4348,0.6255,3.0652,0,4.5c0,0,0,1,3.5,1&#xA;&#x9;s3.5-1,3.5-1c-0.6255-1.4348-0.6255-3.0652,0-4.5C11.6294,7.7586,11.9712,6.3915,12,5z M7.5,13.5&#xA;&#x9;c-0.7966,0.035-1.5937-0.0596-2.36-0.28c0.203-0.7224,0.304-1.4696,0.3-2.22h4.12c-0.004,0.7504,0.097,1.4976,0.3,2.22&#xA;&#x9;C9.0937,13.4404,8.2966,13.535,7.5,13.5z M7.5,5C6.3136,5.0299,5.1306,4.8609,4,4.5v-2C5.131,2.1411,6.3137,1.9722,7.5,2&#xA;&#x9;C8.6863,1.9722,9.869,2.1411,11,2.5v2C9.8694,4.8609,8.6864,5.0299,7.5,5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@1x.png
deleted file mode 100644
index 58b32c227..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@2x.png
deleted file mode 100644
index a5d5c3a44..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@3x.png
deleted file mode 100644
index 6fd69f853..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/beer.imageset/beer@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/Contents.json
index 817adf6ae..62d518976 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"bicycle-share@1x.png","idiom":"universal","scale":"1x"},{"filename":"bicycle-share@2x.png","idiom":"universal","scale":"2x"},{"filename":"bicycle-share@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"bicycle-share.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share.svg
new file mode 100644
index 000000000..4986eb4f3
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="bicycle-share" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="circle4604" d="&#xA;&#x9;M10,1C9.4477,1,9,1.4477,9,2c0,0.5523,0.4477,1,1,1s1-0.4477,1-1C11,1.4477,10.5523,1,10,1z M8.1445,2.9941&#xA;&#x9;c-0.13,0.0005-0.2547,0.0517-0.3477,0.1426l-2.6406,2.5c-0.2256,0.2128-0.2051,0.5775,0.043,0.7637L7,7.75v2.75&#xA;&#x9;c-0.01,0.6762,1.0096,0.6762,1,0v-3c0.0003-0.1574-0.0735-0.3057-0.1992-0.4004L7.0332,6.5234l1.818-1.7212l0.7484,0.9985&#xA;&#x9;C9.6943,5.9265,9.8426,6.0003,10,6h1.5c0.6761,0.01,0.6761-1.0096,0-1h-1.25L9.5,4L8.9004,3.1992&#xA;&#x9;C8.8103,3.0756,8.6685,3,8.5156,2.9941H8.1445z M3,7c-1.6569,0-3,1.3432-3,3s1.3431,3,3,3s3-1.3432,3-3S4.6569,7,3,7z M12,7&#xA;&#x9;c-1.6569,0-3,1.3432-3,3s1.3431,3,3,3s3-1.3432,3-3S13.6569,7,12,7z M3,8c1.1046,0,2,0.8954,2,2s-0.8954,2-2,2s-2-0.8954-2-2&#xA;&#x9;S1.8954,8,3,8z M12,8c1.1046,0,2,0.8954,2,2s-0.8954,2-2,2s-2-0.8954-2-2S10.8954,8,12,8z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@1x.png
deleted file mode 100644
index f5bf3dd6f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@2x.png
deleted file mode 100644
index b843314c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@3x.png
deleted file mode 100644
index e5a6893d7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle-share.imageset/bicycle-share@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/Contents.json
index 97e6be932..14504cfea 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"bicycle@1x.png","idiom":"universal","scale":"1x"},{"filename":"bicycle@2x.png","idiom":"universal","scale":"2x"},{"filename":"bicycle@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"bicycle.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle.svg
new file mode 100644
index 000000000..429ac4d3f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="bicycle" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path4668" d="&#xA;&#x9;M7.5,2c-0.6761-0.01-0.6761,1.0096,0,1H9v1.2656l-2.8027,2.334L5.2226,4H5.5c0.6761,0.01,0.6761-1.0096,0-1h-2&#xA;&#x9;c-0.6761-0.01-0.6761,1.0096,0,1h0.6523L5.043,6.375C4.5752,6.1424,4.0559,6,3.5,6C1.5729,6,0,7.5729,0,9.5S1.5729,13,3.5,13&#xA;&#x9;S7,11.4271,7,9.5c0-0.6699-0.2003-1.2911-0.5293-1.8242L9.291,5.3262l0.4629,1.1602C8.7114,7.0937,8,8.2112,8,9.5&#xA;&#x9;c0,1.9271,1.5729,3.5,3.5,3.5S15,11.4271,15,9.5S13.4271,6,11.5,6c-0.2831,0-0.5544,0.0434-0.8184,0.1074L10,4.4023V2.5&#xA;&#x9;c0-0.2761-0.2239-0.5-0.5-0.5H7.5z M3.5,7c0.5923,0,1.1276,0.2119,1.5547,0.5527l-1.875,1.5625&#xA;&#x9;c-0.5109,0.4273,0.1278,1.1945,0.6406,0.7695l1.875-1.5625C5.8835,8.674,6,9.0711,6,9.5C6,10.8866,4.8866,12,3.5,12S1,10.8866,1,9.5&#xA;&#x9;S2.1133,7,3.5,7L3.5,7z M11.5,7C12.8866,7,14,8.1134,14,9.5S12.8866,12,11.5,12S9,10.8866,9,9.5c0-0.877,0.4468-1.6421,1.125-2.0879&#xA;&#x9;l0.9102,2.2734c0.246,0.6231,1.1804,0.2501,0.9297-0.3711l-0.9082-2.2695C11.2009,7.0193,11.3481,7,11.5,7L11.5,7z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@1x.png
deleted file mode 100644
index 191ae9c3c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@2x.png
deleted file mode 100644
index 7bfdcffcc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@3x.png
deleted file mode 100644
index d849f19df..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bicycle.imageset/bicycle@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/Contents.json
index ebe90ec27..653903a37 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"blood-bank@1x.png","idiom":"universal","scale":"1x"},{"filename":"blood-bank@2x.png","idiom":"universal","scale":"2x"},{"filename":"blood-bank@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"blood-bank.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank.svg
new file mode 100644
index 000000000..01cff5273
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="blood-bank">
+  <path d="m11.2 6.1-3.7-5.1-3.7 5.1c-.5.7-.8 1.6-.8 2.5 0 2.4 2 4.4 4.5 4.4s4.5-2 4.5-4.4c0-.9-.3-1.8-.8-2.5zm-1.2 2.9h-2v2h-1v-2h-2v-1h2v-2h1v2h2z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@1x.png
deleted file mode 100644
index ed04ecd7b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@2x.png
deleted file mode 100644
index fd53a80cc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@3x.png
deleted file mode 100644
index d860a4c47..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/blood-bank.imageset/blood-bank@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/Contents.json
index d491e25b1..e3d693ba6 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"bowling-alley@1x.png","idiom":"universal","scale":"1x"},{"filename":"bowling-alley@2x.png","idiom":"universal","scale":"2x"},{"filename":"bowling-alley@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"bowling-alley.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley.svg
new file mode 100644
index 000000000..644947057
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="bowling-alley">
+  <path d="M10.922 3.166c0 1.006-.335 1.857-.693 2.77-.414 1.052-.86 2.185-.86 3.73 0 2.166.687 4.333 1.409 4.333h1.444c.723 0 1.409-2.166 1.409-4.333 0-1.545-.446-2.678-.86-3.73-.358-.912-.693-1.764-.693-2.77 0-.722.144-.723.144-1.445A.743.743 0 0 0 11.5.999a.743.743 0 0 0-.722.722c0 .723.144.723.144 1.445Zm-2.552 6.5c0-1.234.254-2.236.55-3.091a4.5 4.5 0 1 0-.17 6.038c-.237-.865-.38-1.91-.38-2.947ZM5.24 7.12a.62.62 0 1 1-1.24 0 .62.62 0 0 1 1.24 0Zm-1 2a.62.62 0 1 1-1.24 0 .62.62 0 0 1 1.24 0Zm2 0a.62.62 0 1 1-1.24 0 .62.62 0 0 1 1.24 0Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@1x.png
deleted file mode 100644
index d62b5f77f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@2x.png
deleted file mode 100644
index 375a4f87a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@3x.png
deleted file mode 100644
index 7e008850c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bowling-alley.imageset/bowling-alley@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/Contents.json
index 495f3e351..793226279 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"bridge@1x.png","idiom":"universal","scale":"1x"},{"filename":"bridge@2x.png","idiom":"universal","scale":"2x"},{"filename":"bridge@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"bridge.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge.svg
new file mode 100644
index 000000000..c5f7d490e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="bridge">
+  <path d="m0 6.84201v4.15799h2v-1c.036-1.08899.911-1.96399 2-1.99999 1.089.036 1.964.911 2 1.99999v1h3v-1c.036-1.08899.911-1.96399 2-1.99999 1.089.036 1.964.911 2 1.99999v1h2v-4.15799c-4.4-5.76-11.929-4.442-15 0zm9.5-3.108c.514.121 1.016.289 1.5.5v2.766h-1.5zm-.5-.1v3.366h-1.5v-3.494c.503 0 1.005.043 1.5.128zm-5.5.843c.48-.248.982-.451 1.5-.606v3.129h-1.5zm2 2.523v-3.27c.493-.115.995-.187 1.5-.215v3.485zm-2.5-2.256v2.256h-2.5c.676-.906 1.532-1.672 2.5-2.256zm8.5 2.256v-2.5l-.053-.053c1.202.603 2.247 1.477 3.053 2.553z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@1x.png
deleted file mode 100644
index 8f1b664a6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@2x.png
deleted file mode 100644
index e4b02979f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@3x.png
deleted file mode 100644
index 9f719d98f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/bridge.imageset/bridge@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/Contents.json
index 1273aa376..71dd7c164 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"building-alt1@1x.png","idiom":"universal","scale":"1x"},{"filename":"building-alt1@2x.png","idiom":"universal","scale":"2x"},{"filename":"building-alt1@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"building-alt1.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1.svg
new file mode 100644
index 000000000..0f4265c19
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="building-alt1" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11,13.5v-9C11,4.2,10.8,4,10.5,4H9V1L5,2.1v11.4H2V14h11v-0.5H11z M7,13.5V3h1v10.5H7z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@1x.png
deleted file mode 100644
index 88489b813..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@2x.png
deleted file mode 100644
index 203f43089..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@3x.png
deleted file mode 100644
index bda95bd30..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/building-alt1.imageset/building-alt1@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/Contents.json
index c9a21c698..34b7eeef2 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"building@1x.png","idiom":"universal","scale":"1x"},{"filename":"building@2x.png","idiom":"universal","scale":"2x"},{"filename":"building@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"building.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building.svg
new file mode 100644
index 000000000..8ed863aa9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="building" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M3,2v11h5v-3h3v3h1V2H3z M7,12H4v-2h3V12z M7,9H4V7h3V9z M7,6H4V4h3V6z M11,9H8V7h3V9z M11,6H8V4h3V6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@1x.png
deleted file mode 100644
index beb6db836..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@2x.png
deleted file mode 100644
index 9351759c6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@3x.png
deleted file mode 100644
index 6941fdefd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/building.imageset/building@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bus.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/bus.imageset/Contents.json
new file mode 100644
index 000000000..868db1e33
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bus.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"bus.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/bus.imageset/bus.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/bus.imageset/bus.svg
new file mode 100644
index 000000000..6602f1661
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/bus.imageset/bus.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="bus">
+  <path d="M2 3C2 1.9 2.9 1 4 1H11C12.1 1 13 1.9 13 3V11C13 12 12 12 12 12V13C12 13.55 11.55 14 11 14C10.45 14 10 13.55 10 13V12H5V13C5 13.55 4.55 14 4 14C3.45 14 3 13.55 3 13V12C2 12 2 11 2 11V3ZM3.5 4C3.22 4 3 4.22 3 4.5V7.5C3 7.78 3.22 8 3.5 8H11.5C11.78 8 12 7.78 12 7.5V4.5C12 4.22 11.78 4 11.5 4H3.5ZM4 9C3.45 9 3 9.45 3 10C3 10.55 3.45 11 4 11C4.55 11 5 10.55 5 10C5 9.45 4.55 9 4 9ZM11 9C10.45 9 10 9.45 10 10C10 10.55 10.45 11 11 11C11.55 11 12 10.55 12 10C12 9.45 11.55 9 11 9ZM4 2.5C4 2.78 4.22 3 4.5 3H10.5C10.78 3 11 2.78 11 2.5C11 2.22 10.78 2 10.5 2H4.5C4.22 2 4 2.22 4 2.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cafe.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/cafe.imageset/Contents.json
new file mode 100644
index 000000000..d58a4abc9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cafe.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"cafe.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cafe.imageset/cafe.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/cafe.imageset/cafe.svg
new file mode 100644
index 000000000..acfc9ed76
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cafe.imageset/cafe.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cafe" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12,5h-2V3H2v4c0.0133,2.2091,1.8149,3.9891,4.024,3.9758C7.4345,10.9673,8.7362,10.2166,9.45,9H12c1.1046,0,2-0.8954,2-2&#xA;&#x9;S13.1046,5,12,5z M12,8H9.86C9.9487,7.6739,9.9958,7.3379,10,7V6h2c0.5523,0,1,0.4477,1,1S12.5523,8,12,8z M10,12.5&#xA;&#x9;c0,0.2761-0.2239,0.5-0.5,0.5h-7C2.2239,13,2,12.7761,2,12.5S2.2239,12,2.5,12h7C9.7761,12,10,12.2239,10,12.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/Contents.json
index 254b91c2b..483f2916e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"campsite@1x.png","idiom":"universal","scale":"1x"},{"filename":"campsite@2x.png","idiom":"universal","scale":"2x"},{"filename":"campsite@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"campsite.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite.svg
new file mode 100644
index 000000000..6383b1c4c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="campsite">
+  <path d="M14 10V11C14 11.5523 13.5523 12 13 12H2C1.44772 12 1 11.5523 1 11V10C1 9.44772 1.44772 9.00001 2 9.00001H2.25L7.03206 1.25762C7.24699 0.90965 7.75302 0.909651 7.96794 1.25762L12.75 9.00001H13C13.5523 9.00001 14 9.44772 14 10ZM10.5 9.00001L7.5 4.00001L4.5 9.00001H10.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@1x.png
deleted file mode 100644
index 1c90432b0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@2x.png
deleted file mode 100644
index 9f9a98f94..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@3x.png
deleted file mode 100644
index b1d4123ba..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/campsite.imageset/campsite@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/Contents.json
index 9754441ee..3877822cd 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"car-rental@1x.png","idiom":"universal","scale":"1x"},{"filename":"car-rental@2x.png","idiom":"universal","scale":"2x"},{"filename":"car-rental@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"car-rental.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental.svg
new file mode 100644
index 000000000..3b463b7d4
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="car-rental">
+  <path d="M10.5 1C9.94772 1 9.5 1.44772 9.5 2H2V3L3 4 4 3 5 4 6 3 7 4H9.5C9.5 4.55228 9.94772 5 10.5 5H12.5C12.7761 5 13 4.77614 13 4.5V1.5C13 1.22386 12.7761 1 12.5 1H10.5ZM11 2.5C11 2.22386 11.2239 2 11.5 2 11.7761 2 12 2.22386 12 2.5V3.5C12 3.77614 11.7761 4 11.5 4 11.2239 4 11 3.77614 11 3.5V2.5ZM2.14645 9.35355C2.05268 9.44732 2 9.5745 2 9.70711V13.5C2 13.7761 2.22386 14 2.5 14H4C4.27614 14 4.5 13.7761 4.5 13.5V13H10.5V13.5C10.5 13.7761 10.7239 14 11 14H12.5C12.7761 14 13 13.7761 13 13.5V9.70711C13 9.5745 12.9473 9.44732 12.8536 9.35355L12 8.5 10.6457 6.24275C10.5553 6.09215 10.3925 6 10.2169 6H4.7831C4.60746 6 4.44471 6.09215 4.35435 6.24275L3 8.5 2.14645 9.35355ZM11.1338 9H3.86623L5.06619 7H9.93381L11.1338 9ZM5.5 10.8279V11.2C5.5 11.3657 5.36569 11.5 5.2 11.5H3.3C3.13431 11.5 3 11.3657 3 11.2V10.3659C3 10.1766 3.1732 10.0346 3.35884 10.0718L5.17845 10.4357C5.36542 10.4731 5.5 10.6372 5.5 10.8279ZM12 10.4879V11.2C12 11.3657 11.8657 11.5 11.7 11.5H9.8C9.63431 11.5 9.5 11.3657 9.5 11.2V10.7459C9.5 10.6029 9.60094 10.4798 9.74117 10.4518L11.5216 10.0957C11.7691 10.0462 12 10.2355 12 10.4879Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@1x.png
deleted file mode 100644
index 86729636e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@2x.png
deleted file mode 100644
index ca94d9ccb..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@3x.png
deleted file mode 100644
index 835d53474..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-rental.imageset/car-rental@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/Contents.json
index e18b99ae6..6c0fb880d 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"car-repair@1x.png","idiom":"universal","scale":"1x"},{"filename":"car-repair@2x.png","idiom":"universal","scale":"2x"},{"filename":"car-repair@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"car-repair.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair.svg
new file mode 100644
index 000000000..6a6fdf05e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="car-repair">
+  <path d="M3 5C3.74028 5 4.38662 4.5978 4.73243 4H12C12.5523 4 13 3.55228 13 3 13 2.44772 12.5523 2 12 2H4.73243C4.38662 1.4022 3.74028 1 3 1 2.25972 1 1.61337 1.4022 1.26756 2H3V4H1.26756C1.61337 4.5978 2.25972 5 3 5ZM2.14645 9.35355C2.05268 9.44732 2 9.5745 2 9.70711V13.5C2 13.7761 2.22386 14 2.5 14H4C4.27614 14 4.5 13.7761 4.5 13.5V13H10.5V13.5C10.5 13.7761 10.7239 14 11 14H12.5C12.7761 14 13 13.7761 13 13.5V9.70711C13 9.5745 12.9473 9.44732 12.8536 9.35355L12 8.5 10.6456 6.24275C10.5553 6.09215 10.3925 6 10.2169 6H4.78309C4.60746 6 4.44471 6.09215 4.35435 6.24275L3 8.5 2.14645 9.35355ZM11.1338 9H3.86622L5.06619 7H9.93381L11.1338 9ZM5.5 10.8279V11.2C5.5 11.3657 5.36568 11.5 5.2 11.5H3.3C3.13431 11.5 3 11.3657 3 11.2V10.3659C3 10.1766 3.1732 10.0346 3.35883 10.0718L5.17844 10.4357C5.36541 10.4731 5.5 10.6372 5.5 10.8279ZM12 10.4879V11.2C12 11.3657 11.8657 11.5 11.7 11.5H9.8C9.63431 11.5 9.5 11.3657 9.5 11.2V10.7459C9.5 10.6029 9.60094 10.4798 9.74116 10.4518L11.5216 10.0957C11.7691 10.0462 12 10.2355 12 10.4879Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@1x.png
deleted file mode 100644
index 2365238e2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@2x.png
deleted file mode 100644
index 22f066780..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@3x.png
deleted file mode 100644
index 2c08e204b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car-repair.imageset/car-repair@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/Contents.json
index c358fa50b..1ae870be2 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"car@1x.png","idiom":"universal","scale":"1x"},{"filename":"car@2x.png","idiom":"universal","scale":"2x"},{"filename":"car@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"car.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car.svg
new file mode 100644
index 000000000..5b114987e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="car" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13.84,6.852,12.6,5.7,11.5,3.5a1.05,1.05,0,0,0-.9-.5H4.4a1.05,1.05,0,0,0-.9.5L2.4,5.7,1.16,6.852A.5.5,0,0,0,1,7.219V11.5a.5.5,0,0,0,.5.5h2c.2,0,.5-.2.5-.4V11h7v.5c0,.2.2.5.4.5h2.1a.5.5,0,0,0,.5-.5V7.219A.5.5,0,0,0,13.84,6.852ZM4.5,4h6l1,2h-8ZM5,8.6c0,.2-.3.4-.5.4H2.4C2.2,9,2,8.7,2,8.5V7.4c.1-.3.3-.5.6-.4l2,.4c.2,0,.4.3.4.5Zm8-.1c0,.2-.2.5-.4.5H10.5c-.2,0-.5-.2-.5-.4V7.9c0-.2.2-.5.4-.5l2-.4c.3-.1.5.1.6.4Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@1x.png
deleted file mode 100644
index a719a4f1e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@2x.png
deleted file mode 100644
index ef4787228..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@3x.png
deleted file mode 100644
index e25043571..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/car.imageset/car@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/Contents.json
index 01c365629..f2a84b9ad 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"casino@1x.png","idiom":"universal","scale":"1x"},{"filename":"casino@2x.png","idiom":"universal","scale":"2x"},{"filename":"casino@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"casino.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino.svg
new file mode 100644
index 000000000..e9f7609ea
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="casino" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M8.5,10c0.4561,0.6072,1.1821,1,2,1c1.3807,0,2.5-1.1193,2.5-2.5c0-0.5642-0.1938-1.0789-0.509-1.4973L12.5,7l-5-6l-5,6&#xA;&#x9;l0.009,0.0027C2.1938,7.4211,2,7.9358,2,8.5C2,9.8807,3.1193,11,4.5,11c0.8179,0,1.5439-0.3928,2-1&#xA;&#x9;C6.5997,9.8672,6.7902,9.6135,7,9.3337V11.5C7,13,4.5,13,4.5,13C4.2239,13,4,13.2238,4,13.5C4,13.7761,4.2239,14,4.5,14H7h1h2.5&#xA;&#x9;c0.2761,0,0.5-0.2239,0.5-0.5c0-0.2762-0.2239-0.5-0.5-0.5c0,0-2.5,0-2.5-1.5V9.3337C8.2098,9.6135,8.4003,9.8672,8.5,10z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@1x.png
deleted file mode 100644
index 29be33038..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@2x.png
deleted file mode 100644
index 106142548..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@3x.png
deleted file mode 100644
index 3cc1abecf..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/casino.imageset/casino@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/Contents.json
index 395ad7aac..3f96bf8d6 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"castle-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"castle-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"castle-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"castle-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP.svg
new file mode 100644
index 000000000..9aff75fd3
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="castle-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.5,12.75a1,1,0,0,1-1-.9995V7.25H10a1,1,0,0,1-1-1v-2H6v2a1,1,0,0,1-1,1H3.5v4.5a1,1,0,0,1-2,0V6.25a1,1,0,0,1,1-1H4v-2a1,1,0,0,1,1-1h5a1,1,0,0,1,1,1v2h1.5a1,1,0,0,1,1,1v5.5a1,1,0,0,1-.9995,1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@1x.png
deleted file mode 100644
index 4e00391ce..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@2x.png
deleted file mode 100644
index 1bf118c24..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@3x.png
deleted file mode 100644
index 4c1dbc007..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle-JP.imageset/castle-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/Contents.json
index baf6d19cd..5e4169fab 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"castle@1x.png","idiom":"universal","scale":"1x"},{"filename":"castle@2x.png","idiom":"universal","scale":"2x"},{"filename":"castle@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"castle.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle.svg
new file mode 100644
index 000000000..d16ebbf7e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="castle" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11,4H4C3.4477,4,3,3.5523,3,3V0.5C3,0.2239,3.2239,0,3.5,0S4,0.2239,4,0.5V2h1V1c0-0.5523,0.4477-1,1-1s1,0.4477,1,1v1h1V1&#xA;&#x9;c0-0.5523,0.4477-1,1-1s1,0.4477,1,1v1h1V0.5C11,0.2239,11.2239,0,11.5,0S12,0.2239,12,0.5V3C12,3.5523,11.5523,4,11,4z M14,14.5&#xA;&#x9;c0,0.2761-0.2239,0.5-0.5,0.5h-12C1.2239,15,1,14.7761,1,14.5S1.2239,14,1.5,14H2c0.5523,0,1-0.4477,1-1c0,0,1-6,1-7&#xA;&#x9;c0-0.5523,0.4477-1,1-1h5c0.5523,0,1,0.4477,1,1c0,1,1,7,1,7c0,0.5523,0.4477,1,1,1h0.5c0.2723-0.0001,0.4946,0.2178,0.5,0.49V14.5z&#xA;&#x9; M9,10.5C9,9.6716,8.3284,9,7.5,9S6,9.6716,6,10.5V14h3V10.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@1x.png
deleted file mode 100644
index 7ae1470e7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@2x.png
deleted file mode 100644
index 6baf58233..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@3x.png
deleted file mode 100644
index 25d062f07..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/castle.imageset/castle@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/Contents.json
index fcb225ff0..5a6619c01 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"caution@1x.png","idiom":"universal","scale":"1x"},{"filename":"caution@2x.png","idiom":"universal","scale":"2x"},{"filename":"caution@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"caution.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution.svg
new file mode 100644
index 000000000..5cc7c9757
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="caution">
+  <path d="M1.09302 11.8924L6.84044 1.3905C7.12539 0.869834 7.87461 0.869834 8.15956 1.3905L13.907 11.8924C14.1805 12.3922 13.818 13.0019 13.2474 13.0019H1.75258C1.18195 13.0019 0.819505 12.3922 1.09302 11.8924ZM8.29999 8L8.70296 5.5822C8.75375 5.27743 8.51873 5 8.20976 5H6.79022C6.48125 5 6.24623 5.27743 6.29703 5.5822L6.69999 8H8.29999ZM8.59999 9.9C8.59999 9.29249 8.10751 8.8 7.49999 8.8C6.89248 8.8 6.39999 9.29249 6.39999 9.9C6.39999 10.5075 6.89248 11 7.49999 11C8.10751 11 8.59999 10.5075 8.59999 9.9Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@1x.png
deleted file mode 100644
index febd59789..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@2x.png
deleted file mode 100644
index 4adc17383..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@3x.png
deleted file mode 100644
index c73dc40f3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/caution.imageset/caution@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/Contents.json
index d6c396855..1e74ab819 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"cemetery-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"cemetery-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"cemetery-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"cemetery-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP.svg
new file mode 100644
index 000000000..d4b9c049e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="cemetery-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11.5,11h-3V2.5a.9448.9448,0,0,0-1-1,.9448.9448,0,0,0-1,1V11h-3a1,1,0,0,0,0,2h8a.9448.9448,0,0,0,1-1A1.0022,1.0022,0,0,0,11.5,11Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@1x.png
deleted file mode 100644
index 1214d1a9b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@2x.png
deleted file mode 100644
index d5755d102..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@3x.png
deleted file mode 100644
index 5b2172f40..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery-JP.imageset/cemetery-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/Contents.json
index 5e14c61a6..92f35fb64 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"cemetery@1x.png","idiom":"universal","scale":"1x"},{"filename":"cemetery@2x.png","idiom":"universal","scale":"2x"},{"filename":"cemetery@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"cemetery.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery.svg
new file mode 100644
index 000000000..43d34afa0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cemetery" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11.46,12h-0.68L12,3.55c0.0175-0.2867-0.2008-0.5332-0.4874-0.5507C11.4884,2.9979,11.4641,2.9981,11.44,3h-1.18&#xA;&#x9;c0-0.92-1.23-2-2.75-2S4.77,2.08,4.77,3H3.54C3.253,2.9885,3.0111,3.2117,2.9995,3.4987C2.9988,3.5158,2.999,3.5329,3,3.55L4.2,12&#xA;&#x9;H3.55C3.2609,11.9886,3.0162,12.2112,3,12.5V14h9v-1.51C11.9839,12.2067,11.7435,11.9886,11.46,12z M4.5,5h6v1h-6V5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@1x.png
deleted file mode 100644
index 4de7d5872..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@2x.png
deleted file mode 100644
index 6ab6fd490..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@3x.png
deleted file mode 100644
index dfa5efcac..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cemetery.imageset/cemetery@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/charging-station.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/charging-station.imageset/Contents.json
new file mode 100644
index 000000000..72debe20b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/charging-station.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"charging-station.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/charging-station.imageset/charging-station.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/charging-station.imageset/charging-station.svg
new file mode 100644
index 000000000..59795da03
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/charging-station.imageset/charging-station.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="charging-station" height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg">
+  <path d="M2.64585 7.80112L7.75248 0.837532C7.90807 0.625354 8.15545 0.5 8.41856 0.5C8.9632 0.5 9.35876 1.01788 9.21546 1.54333L8.08612 5.68422C8.04275 5.84326 8.16247 6 8.32731 6H11.7466C12.1627 6 12.5 6.3373 12.5 6.75337C12.5 6.91361 12.4489 7.06967 12.3542 7.19888L7.24752 14.1625C7.09193 14.3746 6.84455 14.5 6.58144 14.5C6.0368 14.5 5.64124 13.9821 5.78454 13.4567L6.91388 9.31578C6.95725 9.15674 6.83753 9 6.67269 9H3.25337C2.83729 9 2.5 8.66271 2.5 8.24663C2.5 8.08639 2.55109 7.93033 2.64585 7.80112Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cinema.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/cinema.imageset/Contents.json
new file mode 100644
index 000000000..cdec1faa0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cinema.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"cinema.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cinema.imageset/cinema.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/cinema.imageset/cinema.svg
new file mode 100644
index 000000000..b3d347106
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cinema.imageset/cinema.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cinema" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M14,7.5v2c0,0.2761-0.2239,0.5-0.5,0.5S13,9.7761,13,9.5c0,0,0.06-0.5-1-0.5h-1v2.5c0,0.2761-0.2239,0.5-0.5,0.5h-8&#xA;&#x9;C2.2239,12,2,11.7761,2,11.5v-4C2,7.2239,2.2239,7,2.5,7h8C10.7761,7,11,7.2239,11,7.5V8h1c1.06,0,1-0.5,1-0.5&#xA;&#x9;C13,7.2239,13.2239,7,13.5,7S14,7.2239,14,7.5z M4,3C2.8954,3,2,3.8954,2,5s0.8954,2,2,2s2-0.8954,2-2S5.1046,3,4,3z M4,6&#xA;&#x9;C3.4477,6,3,5.5523,3,5s0.4477-1,1-1s1,0.4477,1,1S4.5523,6,4,6z M8.5,2C7.1193,2,6,3.1193,6,4.5S7.1193,7,8.5,7S11,5.8807,11,4.5&#xA;&#x9;S9.8807,2,8.5,2z M8.5,6C7.6716,6,7,5.3284,7,4.5S7.6716,3,8.5,3S10,3.6716,10,4.5S9.3284,6,8.5,6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/Contents.json
index ad107e42a..841cbd59c 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"circle-stroked@1x.png","idiom":"universal","scale":"1x"},{"filename":"circle-stroked@2x.png","idiom":"universal","scale":"2x"},{"filename":"circle-stroked@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"circle-stroked.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked.svg
new file mode 100644
index 000000000..4ee0a81db
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="circle-stroked">
+  <path d="M7.5 12.3C4.84898 12.3 2.7 10.151 2.7 7.5C2.7 4.84898 4.84898 2.7 7.5 2.7C10.151 2.7 12.3 4.84898 12.3 7.5C12.3 10.151 10.151 12.3 7.5 12.3ZM7.5 14C11.0899 14 14 11.0899 14 7.5C14 3.9101 11.0899 1 7.5 1C3.9101 1 1 3.9101 1 7.5C1 11.0899 3.9101 14 7.5 14Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@1x.png
deleted file mode 100644
index 2db0de8bf..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@2x.png
deleted file mode 100644
index 29b962f36..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@3x.png
deleted file mode 100644
index 6b5f91cf0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle-stroked.imageset/circle-stroked@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/Contents.json
index 0dfcc6964..7170e2fd0 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"circle@1x.png","idiom":"universal","scale":"1x"},{"filename":"circle@2x.png","idiom":"universal","scale":"2x"},{"filename":"circle@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"circle.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle.svg
new file mode 100644
index 000000000..9b579a760
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="circle" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M14,7.5c0,3.5899-2.9101,6.5-6.5,6.5S1,11.0899,1,7.5S3.9101,1,7.5,1S14,3.9101,14,7.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@1x.png
deleted file mode 100644
index eb42b2533..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@2x.png
deleted file mode 100644
index a564909bc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@3x.png
deleted file mode 100644
index 2ea2312c5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/circle.imageset/circle@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/Contents.json
index 6a1f590c4..5ea42d3b8 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"city@1x.png","idiom":"universal","scale":"1x"},{"filename":"city@2x.png","idiom":"universal","scale":"2x"},{"filename":"city@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"city.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city.svg
new file mode 100644
index 000000000..bfd4ecdff
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="city">
+  <path d="M12.6368 3.9994H10.9981V2.3608C10.998 2.16148 10.8364 1.99994 10.6371 2H10.3591C10.1598 2 9.9982 2.16158 9.9982 2.3609V3.9994H8.36C8.16068 3.9994 7.9991 4.16098 7.9991 4.3603V9.9984H4.3621C4.16168 9.9984 3.9992 10.1609 3.9992 10.3613V12.6358C3.99975 12.8358 4.16207 12.9977 4.3621 12.9977H12.6368C12.8361 12.9977 12.9977 12.8361 12.9977 12.6368V4.36C12.9977 4.16068 12.8361 3.9994 12.6368 3.9994ZM5.9989 11.9981H4.9989V10.9981H5.9989V11.9981ZM7.9989 11.9981H6.9989V10.9981H7.9989V11.9981ZM9.9989 11.9981H8.9989V10.9981H9.9989V11.9981ZM9.9989 9.9981H8.9989V8.9981H9.9989V9.9981ZM9.9989 7.9981H8.9989V6.9981H9.9989V7.9981ZM9.9989 5.9981H8.9989V4.9981H9.9989V5.9981ZM11.9989 11.9971H10.9989V10.9971H11.9989V11.9971ZM11.9989 9.9971H10.9989V8.9971H11.9989V9.9971ZM11.9989 7.9971H10.9989V6.9971H11.9989V7.9971ZM11.9989 5.9971H10.9989V4.9971H11.9989V5.9971ZM6.9987 2.3608C6.99864 2.16152 6.83708 2 6.6378 2H4.36C4.16068 2 3.9991 2.16158 3.9991 2.3609V4H2.36C2.16138 4.00049 2.00049 4.16138 2 4.36V12.6474C2 12.8407 2.1567 12.9974 2.35 12.9974H2.9994V8.9986H6.9987V2.3608ZM4 7.9981H3V6.9981H4V7.9981ZM4 5.9981H3V4.9981H4V5.9981ZM6 7.9981H5V6.9981H6V7.9981ZM6 5.9981H5V4.9981H6V5.9981ZM6 3.9981H5V3H6V4V3.9981Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@1x.png
deleted file mode 100644
index 877ccc17c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@2x.png
deleted file mode 100644
index c08c7b4dd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@3x.png
deleted file mode 100644
index c1da4a639..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/city.imageset/city@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/clothing-store.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/clothing-store.imageset/Contents.json
new file mode 100644
index 000000000..46cc1ee30
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/clothing-store.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"clothing-store.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/clothing-store.imageset/clothing-store.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/clothing-store.imageset/clothing-store.svg
new file mode 100644
index 000000000..3de5fc0e2
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/clothing-store.imageset/clothing-store.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="clothing-store">
+  <path d="M4 2L1 4.5L1 7H4V13H11V7H14V4.5L11 2H9.5L7.5 6L5.5 2L4 2Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/Contents.json
index daca17800..8ea581786 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"college-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"college-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"college-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"college-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP.svg
new file mode 100644
index 000000000..55888b0da
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="college-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.5,2.9992h-4v-1a1,1,0,0,0-2,0v1h-4a1,1,0,0,0,0,2h.67A10.8169,10.8169,0,0,0,5.15,8.8105c.3331.4313.6594.8248.9785,1.1936a14.3825,14.3825,0,0,1-2.6074,2.117,1,1,0,1,0,.955,1.7581h0A15.65,15.65,0,0,0,7.5,11.4613a15.65,15.65,0,0,0,3.0239,2.4179,1,1,0,1,0,.9551-1.7578,14.3789,14.3789,0,0,1-2.6073-2.1171c.3191-.3688.6453-.7622.9784-1.1935a10.818,10.818,0,0,0,1.98-3.8116h.67a1,1,0,0,0,0-2ZM8.2671,7.5879c-.2614.3385-.5154.6413-.767.937-.2517-.2957-.5057-.5985-.7672-.937A9.5885,9.5885,0,0,1,5.2676,4.9992H9.7319A9.5789,9.5789,0,0,1,8.2671,7.5879Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@1x.png
deleted file mode 100644
index 83040e771..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@2x.png
deleted file mode 100644
index 5f49a6729..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@3x.png
deleted file mode 100644
index 281e14bf4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/college-JP.imageset/college-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/Contents.json
index 1d9c15512..4ae121f1a 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"college@1x.png","idiom":"universal","scale":"1x"},{"filename":"college@2x.png","idiom":"universal","scale":"2x"},{"filename":"college@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"college.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college.svg
new file mode 100644
index 000000000..6809f7def
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="college" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M7.5,1L0,4.5l2,0.9v1.7C1.4,7.3,1,7.9,1,8.5s0.4,1.2,1,1.4V10l-0.9,2.1&#xA; C0.8,13,1,14,2.5,14s1.7-1,1.4-1.9L3,10c0.6-0.3,1-0.8,1-1.5S3.6,7.3,3,7.1V5.9L7.5,8L15,4.5L7.5,1z M11.9,7.5l-4.5,2L5,8.4v0.1&#xA; c0,0.7-0.3,1.3-0.8,1.8l0.6,1.4v0.1C4.9,12.2,5,12.6,4.9,13c0.7,0.3,1.5,0.5,2.5,0.5c3.3,0,4.5-2,4.5-3L11.9,7.5L11.9,7.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@1x.png
deleted file mode 100644
index dcd62dec8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@2x.png
deleted file mode 100644
index 3a47f421b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@3x.png
deleted file mode 100644
index 1a9f60c5c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/college.imageset/college@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/Contents.json
index f730d6783..e7a7f3283 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"commercial@1x.png","idiom":"universal","scale":"1x"},{"filename":"commercial@2x.png","idiom":"universal","scale":"2x"},{"filename":"commercial@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"commercial.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial.svg
new file mode 100644
index 000000000..a1e68951a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="commercial">
+  <path d="m14 6h-13c.0881-1.3829.427-2.7383 1-4h11c.5731 1.2617.9119 2.6171 1 4zm-11 1h9v6h-1v-5h-3v5h-5zm1 3h3v-2h-3z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@1x.png
deleted file mode 100644
index a58622907..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@2x.png
deleted file mode 100644
index 3c352ec9d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@3x.png
deleted file mode 100644
index 4ea31fff5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/commercial.imageset/commercial@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/Contents.json
index 0dd22ba7e..93244d45e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"communications-tower@1x.png","idiom":"universal","scale":"1x"},{"filename":"communications-tower@2x.png","idiom":"universal","scale":"2x"},{"filename":"communications-tower@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"communications-tower.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower.svg
new file mode 100644
index 000000000..97377ec71
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="communications-tower" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11.8545,6.4336l-.4131-.2813a4.7623,4.7623,0,0,0,.2813-4.8779l-.0835-.1533L12.0747.875l.0908.167a5.2619,5.2619,0,0,1-.311,5.3916Zm1.1521,7.1316V14h-11v-.4348H4.4952L6.0439,6.4a.5.5,0,0,1,.4888-.3945h.7255V4.6014A1.14,1.14,0,0,1,6.3756,3.5a1.1568,1.1568,0,1,1,2.3136,0,1.14,1.14,0,0,1-.931,1.1112V6.0059h.7223A.5.5,0,0,1,8.9692,6.4l1.5478,7.1648ZM8.4543,8.751H6.5588L6.236,10.2441H8.777ZM6.1279,10.7441l-.3233,1.4952H9.2082l-.3231-1.4952ZM6.936,7.0059,6.6669,8.251H8.3463L8.0771,7.0059ZM5.5179,13.5652H9.4948l-.1786-.8259h-3.62ZM5.21,5.0137a2.7523,2.7523,0,0,1,.0161-3.0518L4.812,1.6826a3.25,3.25,0,0,0-.019,3.6065ZM10.7568,3.5a3.2433,3.2433,0,0,0-.5341-1.7861l-.418.2754a2.7517,2.7517,0,0,1-.0176,3.0488l.4141.2793A3.2341,3.2341,0,0,0,10.7568,3.5ZM3.5342,6.1182A4.7637,4.7637,0,0,1,3.3813,1.13L2.9478.88a5.2643,5.2643,0,0,0,.1694,5.5137Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@1x.png
deleted file mode 100644
index f5ee53628..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@2x.png
deleted file mode 100644
index 2d83a95f7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@3x.png
deleted file mode 100644
index 7fda23696..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/communications-tower.imageset/communications-tower@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/Contents.json
index 4373566cc..99e762fcc 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"confectionery@1x.png","idiom":"universal","scale":"1x"},{"filename":"confectionery@2x.png","idiom":"universal","scale":"2x"},{"filename":"confectionery@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"confectionery.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery.svg
new file mode 100644
index 000000000..4e9456bcf
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="confectionery" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13,4a1,1,0,0,0-1-1,1,1,0,0,0-2,0V5.0673A3.4808,3.4808,0,0,0,4.3583,9H2a1,1,0,0,0,0,2,1,1,0,0,0,1,1,1,1,0,0,0,2,0V9.9326A3.4807,3.4807,0,0,0,10.6417,6H13a1,1,0,0,0,0-2ZM7.5,9.9925A2.484,2.484,0,0,1,6.3184,5.319a1.0809,1.0809,0,0,1,.5459.307A2.1243,2.1243,0,0,1,7.25,7.0117l.001.9561A2.5821,2.5821,0,0,0,7.76,9.7031a1.5462,1.5462,0,0,0,.2591.2333A2.4861,2.4861,0,0,1,7.5,9.9925ZM8.6815,9.681a1.0813,1.0813,0,0,1-.5458-.307A2.1243,2.1243,0,0,1,7.75,7.9883l-.001-.9561A2.5821,2.5821,0,0,0,7.24,5.2969a1.5557,1.5557,0,0,0-.2592-.2334A2.4843,2.4843,0,0,1,8.6815,9.681Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@1x.png
deleted file mode 100644
index 983e1fa67..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@2x.png
deleted file mode 100644
index f52f2ac5b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@3x.png
deleted file mode 100644
index 6e1bc7d07..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/confectionery.imageset/confectionery@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/Contents.json
index 1f4fd6d0f..ef19f5c25 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"construction@1x.png","idiom":"universal","scale":"1x"},{"filename":"construction@2x.png","idiom":"universal","scale":"2x"},{"filename":"construction@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"construction.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction.svg
new file mode 100644
index 000000000..396c84e43
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="construction">
+  <path d="M13.5 11h-1.8L8.2.5C8-.2 7-.2 6.8.5L3.3 11H1.5c-.3 0-.5.2-.5.5v1c0 .3.2.5.5.5h12c.3 0 .5-.2.5-.5v-1c0-.3-.2-.5-.5-.5ZM7 3h1l.7 2H6.4L7 3ZM5.7 7h3.6l.7 2H5l.7-2Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@1x.png
deleted file mode 100644
index ddc9e1050..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@2x.png
deleted file mode 100644
index 13f84c4d3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@3x.png
deleted file mode 100644
index f84d18059..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/construction.imageset/construction@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/Contents.json
index 5351e6020..a9999fa16 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"convenience@1x.png","idiom":"universal","scale":"1x"},{"filename":"convenience@2x.png","idiom":"universal","scale":"2x"},{"filename":"convenience@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"convenience.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience.svg
new file mode 100644
index 000000000..f0dc3d55a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="convenience" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M2.9982,3.0687s.1875-1.062,1-1.062H5.0043V1.7276a.5.5,0,0,1,.5-.5H9.4882a.5.5,0,0,1,.5.5v.2791h1.01a.8324.8324,0,0,1,.6373.2937,1.7589,1.7589,0,0,1,.3627.7683s.3108,1.5719.5921,2.9181h-.938L11,3,3.982,2.9956,3.3336,5.9868H2.382Zm11,4.9144a1,1,0,0,1-.9992,1l-1.0008,3.973s-.1875,1.0417-1,1.0417h-7c-.8125,0-1-1.0417-1-1.0417L1.9822,8.98a.9985.9985,0,0,1,.016-1.9968h11A1,1,0,0,1,13.9982,7.9831ZM5.0327,12.13,5.03,11.0051,4.6392,9.4686a.5373.5373,0,1,0-1.0649.1445L3.78,11.0075l.1874,1.2672A.5373.5373,0,1,0,5.0327,12.13Zm2-2.5967A.5332.5332,0,0,0,6.4994,9l-.0039.0008L6.4886,9a.4992.4992,0,0,0-.3575.1509.529.529,0,0,0-.1648.3828v2.68a.5332.5332,0,1,0,1.0663,0Zm1.998,0A.5314.5314,0,0,0,8.694,9.04a.4992.4992,0,0,0-.393,0,.5312.5312,0,0,0-.3366.4934v2.68a.5331.5331,0,1,0,1.0662,0Zm2.3857.08a.5373.5373,0,1,0-1.0649-.1445L9.96,10.9938,9.9579,12.13a.5373.5373,0,1,0,1.0649.1446Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@1x.png
deleted file mode 100644
index b510262da..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@2x.png
deleted file mode 100644
index 3cb9030c8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@3x.png
deleted file mode 100644
index ceef87812..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/convenience.imageset/convenience@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/Contents.json
index a8e2aac45..dac8ad067 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"cricket@1x.png","idiom":"universal","scale":"1x"},{"filename":"cricket@2x.png","idiom":"universal","scale":"2x"},{"filename":"cricket@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"cricket.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket.svg
new file mode 100644
index 000000000..6d1a3d3bb
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cricket" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M8,1.5C8,2.3284,7.3284,3,6.5,3S5,2.3284,5,1.5S5.6716,0,6.5,0S8,0.6716,8,1.5z M10.88,7.18L10.88,7.18l-2-2l0,0l0,0&#xA;&#x9;C8.7815,5.0616,8.6339,4.9952,8.48,5H3.75C3.3736,4.9915,3.0508,5.2669,3,5.64l0,0l-1,7.7l0,0c-0.0068,0.0464-0.0068,0.0936,0,0.14&#xA;&#x9;c0,0.2761,0.2239,0.5,0.5,0.5c0.2251,0.0153,0.4315-0.1251,0.5-0.34l0,0l1.2-3.89l0,0l0.26-0.83l0.4,0.44l0,0L6,10.6v2.9&#xA;&#x9;C6,13.7761,6.2239,14,6.5,14S7,13.7761,7,13.5v-3l0,0l0,0c-0.0081-0.0788-0.0356-0.1544-0.08-0.22l0,0L5.48,8.5l1-2.5h1.71l2,1.84&#xA;&#x9;l0,0c0.0928,0.1077,0.2278,0.1697,0.37,0.17C10.8163,7.9791,11.007,7.7581,11,7.5C10.9997,7.3824,10.9571,7.2688,10.88,7.18z&#xA;&#x9; M14,11.27c-0.4142,0-0.75,0.3358-0.75,0.75s0.3358,0.75,0.75,0.75s0.75-0.3358,0.75-0.75S14.4142,11.27,14,11.27z M10.76,9.74V9&#xA;&#x9;c0-0.1381-0.1119-0.25-0.25-0.25S10.26,8.8619,10.26,9v0.74c-0.1522,0.0855-0.2474,0.2455-0.25,0.42v3.34&#xA;&#x9;c0,0.2761,0.2239,0.5,0.5,0.5s0.5-0.2239,0.5-0.5v-3.34C11.0074,9.9855,10.9122,9.8255,10.76,9.74z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@1x.png
deleted file mode 100644
index 0ece26bee..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@2x.png
deleted file mode 100644
index 577580fe7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@3x.png
deleted file mode 100644
index 09bc0c84e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cricket.imageset/cricket@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/Contents.json
index cb0a9406d..1e1f9455b 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"cross@1x.png","idiom":"universal","scale":"1x"},{"filename":"cross@2x.png","idiom":"universal","scale":"2x"},{"filename":"cross@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"cross.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross.svg
new file mode 100644
index 000000000..dc15175e1
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="cross">
+  <path d="M3.64 2.27L7.5 6.13L11.34 2.29C11.5114 2.1076 11.7497 2.0029 12 2C12.5523 2 13 2.4477 13 3C13.0047 3.2478 12.907 3.4866 12.73 3.66L8.84 7.5L12.73 11.39C12.8948 11.5512 12.9915 11.7696 13 12C13 12.5523 12.5523 13 12 13C11.7423 13.0107 11.492 12.9127 11.31 12.73L7.5 8.87L3.65 12.72C3.4793 12.8963 3.2453 12.9971 3 13C2.4477 13 2 12.5523 2 12C1.9953 11.7522 2.093 11.5134 2.27 11.34L6.16 7.5L2.27 3.61C2.1052 3.4488 2.0085 3.2304 2 3C2 2.4477 2.4477 2 3 2C3.2404 2.0029 3.4701 2.0998 3.64 2.27Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@1x.png
deleted file mode 100644
index 56e177d4b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@2x.png
deleted file mode 100644
index 27ea5fa62..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@3x.png
deleted file mode 100644
index 283c3e324..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/cross.imageset/cross@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/Contents.json
index 450e06684..939bfc457 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"dam@1x.png","idiom":"universal","scale":"1x"},{"filename":"dam@2x.png","idiom":"universal","scale":"2x"},{"filename":"dam@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"dam.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam.svg
new file mode 100644
index 000000000..c3e49e90a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="dam" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13.94,9.5c0,0.2761-0.2239,0.5-0.5,0.5l0,0c-0.259,0.0219-0.4994,0.1439-0.67,0.34c-0.2714,0.2887-0.6175,0.4964-1,0.6&#xA;&#x9;c-0.6115,0.1816-1.2734,0.0424-1.76-0.37l-0.39-0.35c-0.2976-0.3038-0.7851-0.3087-1.0889-0.0111&#xA;&#x9;C8.5274,10.2126,8.5237,10.2163,8.52,10.22c-0.14,0.12-0.27,0.25-0.42,0.37c-0.7278,0.5784-1.7663,0.5489-2.46-0.07L5.3,10.19&#xA;&#x9;l-0.1-0.06l0.3,1.22l0.49,2c0.0829,0.2634-0.0634,0.5441-0.3267,0.6271C5.6105,13.9937,5.5553,14.0014,5.5,14h-4&#xA;&#x9;C1.2239,14,1,13.7761,1,13.5v-12C1,1.2239,1.2239,1,1.5,1h1.1c0.2346-0.0011,0.4384,0.1611,0.49,0.39L4,5.06V5.2&#xA;&#x9;c0.6569-0.314,1.4361-0.2205,2,0.24c0.16,0.13,0.31,0.28,0.47,0.41c0.2847,0.2546,0.7153,0.2546,1,0c0.16-0.13,0.31-0.28,0.47-0.41&#xA;&#x9;c0.7076-0.5968,1.7424-0.5968,2.45,0c0.15,0.13,0.29,0.27,0.44,0.39c0.2847,0.2546,0.7153,0.2546,1,0l0.47-0.41&#xA;&#x9;c0.3163-0.2672,0.7159-0.4157,1.13-0.42l0,0c0.2761,0,0.5,0.2239,0.5,0.5S13.7061,6,13.43,6l0,0&#xA;&#x9;c-0.259,0.0219-0.4994,0.1439-0.67,0.34c-0.2714,0.2887-0.6175,0.4964-1,0.6C11.1485,7.1216,10.4866,6.9824,10,6.57L9.67,6.23&#xA;&#x9;C9.3724,5.9262,8.8849,5.9213,8.5811,6.2189C8.5774,6.2226,8.5737,6.2263,8.57,6.23C8.43,6.35,8.3,6.48,8.15,6.6&#xA;&#x9;C7.4222,7.1784,6.3837,7.1489,5.69,6.53L5.3,6.19c-0.2847-0.2546-0.7153-0.2546-1,0L4.24,6.24L4.93,9&#xA;&#x9;C5.3226,9.029,5.6965,9.1793,6,9.43c0.16,0.13,0.31,0.28,0.47,0.41c0.2847,0.2546,0.7153,0.2546,1,0c0.16-0.13,0.31-0.28,0.47-0.41&#xA;&#x9;c0.7076-0.5968,1.7424-0.5968,2.45,0c0.15,0.13,0.29,0.27,0.44,0.39c0.2847,0.2546,0.7153,0.2546,1,0l0.47-0.41&#xA;&#x9;c0.3177-0.2636,0.7172-0.4085,1.13-0.41l0,0c0.2761-0.0055,0.5044,0.2138,0.5099,0.4899C13.94,9.4933,13.94,9.4966,13.94,9.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@1x.png
deleted file mode 100644
index 892a0e110..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@2x.png
deleted file mode 100644
index 1af184fbd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@3x.png
deleted file mode 100644
index 20d9023c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dam.imageset/dam@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/Contents.json
index 2730e03a2..0009a3846 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"danger@1x.png","idiom":"universal","scale":"1x"},{"filename":"danger@2x.png","idiom":"universal","scale":"2x"},{"filename":"danger@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"danger.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger.svg
new file mode 100644
index 000000000..a601f55bc
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="danger" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13.94,14.68c-0.0749,0.194-0.262,0.3215-0.47,0.32c-0.0595,0.0107-0.1205,0.0107-0.18,0L7.5,12.56L1.7,15&#xA;&#x9;c-0.2572,0.1005-0.5472-0.0266-0.6476-0.2838C1.0516,14.7141,1.0508,14.7121,1.05,14.71c-0.1291-0.2441-0.0358-0.5467,0.2084-0.6757&#xA;&#x9;C1.2845,14.0205,1.3118,14.009,1.34,14l4.85-2l-4.85-2C1.0758,9.9197,0.9267,9.6404,1.007,9.3762s0.3596-0.4133,0.6238-0.333&#xA;&#x9;C1.6545,9.0504,1.6776,9.0594,1.7,9.07l5.8,2.41l5.8-2.41c0.2494-0.1185,0.5477-0.0124,0.6662,0.237&#xA;&#x9;c0.1185,0.2494,0.0124,0.5477-0.237,0.6662C13.7068,9.9839,13.6837,9.9928,13.66,10L8.8,12l4.85,2&#xA;&#x9;c0.2607,0.091,0.3983,0.3761,0.3074,0.6368C13.9523,14.6515,13.9465,14.6659,13.94,14.68z M12,4.23v0.45&#xA;&#x9;c-0.0021,0.2129-0.0722,0.4196-0.2,0.59C11.2414,5.8883,10.6399,6.4664,10,7v1.16c0.0015,0.208-0.126,0.3951-0.32,0.47L7.52,9.5&#xA;&#x9;H7.45L5.28,8.63C5.1016,8.5428,4.9917,8.3584,5,8.16V7C4.3528,6.4675,3.7446,5.8893,3.18,5.27C3.0593,5.0972,2.9963,4.8907,3,4.68&#xA;&#x9;V4.23C3.1669,2.0117,4.8974,0.2307,7.11,0h0.36l0,0h0.39C10.0862,0.2131,11.8348,1.9997,12,4.23z M6,4c0-0.5523-0.4477-1-1-1&#xA;&#x9;S4,3.4477,4,4s0.4477,1,1,1S6,4.5523,6,4z M7,7c0-0.2761-0.2239-0.5-0.5-0.5S6,6.7239,6,7v0.5C6,7.7761,6.2239,8,6.5,8&#xA;&#x9;S7,7.7761,7,7.5V7z M9,7c0-0.2761-0.2239-0.5-0.5-0.5S8,6.7239,8,7v0.5C8,7.7761,8.2239,8,8.5,8S9,7.7761,9,7.5V7z M11,4&#xA;&#x9;c0-0.5523-0.4477-1-1-1S9,3.4477,9,4s0.4477,1,1,1S11,4.5523,11,4z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@1x.png
deleted file mode 100644
index a89ad07f4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@2x.png
deleted file mode 100644
index c7b1bcf24..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@3x.png
deleted file mode 100644
index 2f5eb960d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/danger.imageset/danger@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/Contents.json
index 8a43a17fc..1da666df2 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"defibrillator@1x.png","idiom":"universal","scale":"1x"},{"filename":"defibrillator@2x.png","idiom":"universal","scale":"2x"},{"filename":"defibrillator@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"defibrillator.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator.svg
new file mode 100644
index 000000000..ec91f62d9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="defibrillator">
+  <path d="m1.54995 7.33811c-2.386799-4.5965 3.63-7.660899 5.952-3.0644 2.3215-4.596499 8.33875-1.5322 5.95235 3.0644-.0869.1671-.2028.3456-.3114.5212h-1.8079l-1.81455-2.7216c-.06321-.09473-.1511-.1704-.25417-.21884-.10308-.04843-.21743-.06779-.3307-.05599-.11327.01181-.22117.05433-.31205.12298-.09087.06865-.16126.16082-.20358.26655l-1.6484 4.12-1.33-1.33c-.11716-.11707-.27597-.18288-.4416-.183h-3.1389c-.1086-.1757-.2245-.3542-.3111-.5213zm9.45005 1.7713c-.103-.00003-.2044-.02545-.2951-.07399-.0908-.04854-.1682-.11871-.2254-.20431l-1.34085-2.0111-1.5587 3.89679c-.03839.096-.10002.181-.17936.2474-.07935.0663-.17393.1119-.27524.1326-.04125.0086-.08327.0128-.1254.0126-.16568.0001-.32462-.0656-.4419-.1826l-1.8169-1.81739h-2.0054c1.36645 1.66819 2.85739 3.23039 4.46 4.67319.08531.077.19616.1197.3111.1197s.22579-.0427.3111-.1197c1.59778-1.4447 3.08545-3.0068 4.45055-4.67319z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@1x.png
deleted file mode 100644
index c5c35abe2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@2x.png
deleted file mode 100644
index 103f2cbc7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@3x.png
deleted file mode 100644
index 0051557a4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/defibrillator.imageset/defibrillator@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/Contents.json
index 5a2e3571b..2ff331291 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"dentist@1x.png","idiom":"universal","scale":"1x"},{"filename":"dentist@2x.png","idiom":"universal","scale":"2x"},{"filename":"dentist@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"dentist.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist.svg
new file mode 100644
index 000000000..26a5c4b2d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="dentist" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M4.36,14c-1,0-0.56-2.67-0.86-5c-0.1-0.76-1-1.49-1.12-2.06C2,5,1.39,1.44,3.66,1S6,3,7.54,3s1.57-2.36,3.85-2&#xA;&#x9;s1.59,3.9,1.29,5.9c-0.1,0.45-1.1,1.48-1.18,2.06c-0.33,2.4,0.32,5-0.8,5c-0.93,0-1.32-2.72-2-4.5C8.43,8.63,8.06,8,7.54,8&#xA;&#x9;C6,8,5.75,14,4.36,14z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@1x.png
deleted file mode 100644
index 9860c2b2b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@2x.png
deleted file mode 100644
index c3afc4d48..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@3x.png
deleted file mode 100644
index 636a55fa6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dentist.imageset/dentist@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/Contents.json
index df5d1f8a4..c94c0a13d 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"diamond@1x.png","idiom":"universal","scale":"1x"},{"filename":"diamond@2x.png","idiom":"universal","scale":"2x"},{"filename":"diamond@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"diamond.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond.svg
new file mode 100644
index 000000000..339cb516b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="diamond">
+  <path d="M7.03715 1.20147L2.12542 6.7C2.04962 6.78393 2.00568 6.89005 2.00051 7C1.99535 7.10994 2.02925 7.21013 2.09689 7.3L7.0065 13.7601C7.06233 13.8343 7.13629 13.8947 7.22216 13.9365C7.30803 13.9782 7.40331 14 7.5 14C7.59669 14 7.69197 13.9782 7.77784 13.9365C7.86371 13.8947 7.93766 13.8343 7.9935 13.7601L12.9031 7.3C12.9707 7.21013 13.0047 7.10994 12.9995 7C12.9943 6.89005 12.9504 6.78393 12.8746 6.7L7.96285 1.20147C7.90591 1.13833 7.83501 1.08761 7.75508 1.05282C7.67514 1.01802 7.5881 1 7.5 1C7.4119 1 7.32486 1.01802 7.24492 1.05282C7.16499 1.08761 7.09409 1.13833 7.03715 1.20147Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@1x.png
deleted file mode 100644
index 9ce1538f9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@2x.png
deleted file mode 100644
index 5a1cac2a6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@3x.png
deleted file mode 100644
index f3d6d67ce..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/diamond.imageset/diamond@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/Contents.json
index 230db2cdb..c99c7ee8b 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"doctor@1x.png","idiom":"universal","scale":"1x"},{"filename":"doctor@2x.png","idiom":"universal","scale":"2x"},{"filename":"doctor@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"doctor.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor.svg
new file mode 100644
index 000000000..80b86891f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="doctor" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M5.5,7C4.1193,7,3,5.8807,3,4.5l0,0v-2C3,2.2239,3.2239,2,3.5,2H4c0.2761,0,0.5-0.2239,0.5-0.5S4.2761,1,4,1H3.5&#xA;&#x9;C2.6716,1,2,1.6716,2,2.5v2c0.0013,1.1466,0.5658,2.2195,1.51,2.87l0,0C4.4131,8.1662,4.9514,9.297,5,10.5C5,12.433,6.567,14,8.5,14&#xA;&#x9;s3.5-1.567,3.5-3.5V9.93c1.0695-0.2761,1.7126-1.367,1.4365-2.4365C13.1603,6.424,12.0695,5.7809,11,6.057&#xA;&#x9;C9.9305,6.3332,9.2874,7.424,9.5635,8.4935C9.7454,9.198,10.2955,9.7481,11,9.93v0.57c0,1.3807-1.1193,2.5-2.5,2.5S6,11.8807,6,10.5&#xA;&#x9;c0.0511-1.2045,0.5932-2.3356,1.5-3.13l0,0C8.4404,6.7172,9.001,5.6448,9,4.5v-2C9,1.6716,8.3284,1,7.5,1H7&#xA;&#x9;C6.7239,1,6.5,1.2239,6.5,1.5S6.7239,2,7,2h0.5C7.7761,2,8,2.2239,8,2.5v2l0,0C8,5.8807,6.8807,7,5.5,7 M11.5,9&#xA;&#x9;c-0.5523,0-1-0.4477-1-1s0.4477-1,1-1s1,0.4477,1,1S12.0523,9,11.5,9z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@1x.png
deleted file mode 100644
index 4a427c160..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@2x.png
deleted file mode 100644
index e13899caa..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@3x.png
deleted file mode 100644
index 0fecd079c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/doctor.imageset/doctor@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/Contents.json
index be4fe89c2..1cb102f22 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"dog-park@1x.png","idiom":"universal","scale":"1x"},{"filename":"dog-park@2x.png","idiom":"universal","scale":"2x"},{"filename":"dog-park@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"dog-park.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park.svg
new file mode 100644
index 000000000..8a20cb818
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" id="dog-park" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M 10.300781 1.2207031 C 9.9144812 1.2207031 9.6 1.2 9.5 2 L 9.0996094 4.5214844 L 11.5 6.5 L 13.5 6.5 C 14.9 6.5 15 5.5410156 15 5.5410156 L 13.099609 3.3222656 C 12.399609 2.6222656 11.7 2.5 11 2.5 L 11 2 C 11 2 11.067481 1.2206031 10.300781 1.2207031 z M 4.75 1.5 C 4.75 1.5 3.7992187 1.5206031 3.1992188 1.7207031 C 2.5992187 1.9207031 2 2.6210938 2 3.6210938 L 2 7.5214844 C 2 9.2214844 1.3 9.5 1 9.5 C 1 9.5 0 9.5214844 0 10.521484 L 0 12.720703 C 0 12.720703 0.00078125 13.521484 0.80078125 13.521484 L 1 13.521484 L 1.5 13.521484 L 2 13.521484 L 2 13.021484 L 2 12.822266 C 2 12.422266 1.8 12.221094 1.5 12.121094 L 1.5 11.021484 C 2.5 11.021484 2.6 10.820703 3 10.720703 L 3.5507812 12.917969 C 3.6507813 13.217969 3.7507813 13.417578 4.0507812 13.517578 L 5.0507812 13.517578 L 6 13.5 L 6 12.699219 C 6 12.022819 5 12 5 12 L 5 9.5 L 8.5 9.5 L 9.1992188 12.121094 C 9.5992188 13.521094 10.5 13.5 10.5 13.5 L 11 13.5 L 12 13.5 L 12 12.699219 C 12 11.987419 11 12 11 12 L 11.099609 7.921875 L 8 5.5 L 3.5 5.5 L 3.5 3.5 C 3.5 3.1 3.7765 3.0053 4 3 C 4.4941 2.9882 4.75 3 4.75 3 C 5.1642 3 5.5 2.6642 5.5 2.25 C 5.5 1.8358 5.1642 1.5 4.75 1.5 z M 11.75 4 C 11.8881 4 12 4.1119 12 4.25 C 12 4.3881 11.8881 4.5 11.75 4.5 C 11.6119 4.5 11.5 4.3881 11.5 4.25 C 11.5 4.1119 11.6119 4 11.75 4 z " id="path5"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@1x.png
deleted file mode 100644
index 35c235047..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@2x.png
deleted file mode 100644
index 323a41112..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@3x.png
deleted file mode 100644
index da14c0c1f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/dog-park.imageset/dog-park@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/Contents.json
index c73e6400d..b8c621509 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"drinking-water@1x.png","idiom":"universal","scale":"1x"},{"filename":"drinking-water@2x.png","idiom":"universal","scale":"2x"},{"filename":"drinking-water@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"drinking-water.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water.svg
new file mode 100644
index 000000000..b9b7053bc
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="drinking-water">
+  <path d="M6,1A2,2,0,0,0,4,3V6.5a.5.5,0,0,0,.5.5h2A.5.5,0,0,0,7,6.5v-2A.5.5,0,0,1,7.5,4H14V1ZM7,15H4a.5.5,0,0,1-.48-.38L2,8.62a.5.5,0,0,1,.365-.606A.558.558,0,0,1,2.5,8h6a.5.5,0,0,1,.514.485A.47.47,0,0,1,9,8.62l-1.5,6A.5.5,0,0,1,7,15ZM3.65,11H7.36l.5-2H3.14Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@1x.png
deleted file mode 100644
index b4b98ef4b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@2x.png
deleted file mode 100644
index fa199a3e6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@3x.png
deleted file mode 100644
index a8bf8b345..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/drinking-water.imageset/drinking-water@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/Contents.json
index d317fd077..ff96a8211 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"elevator@1x.png","idiom":"universal","scale":"1x"},{"filename":"elevator@2x.png","idiom":"universal","scale":"2x"},{"filename":"elevator@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"elevator.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator.svg
new file mode 100644
index 000000000..52ad21424
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="elevator" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11,1H4A1,1,0,0,0,3,2V13a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V2A1,1,0,0,0,11,1ZM7.5,12.5l-2-4h4Zm-2-6,2-4,2,4Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@1x.png
deleted file mode 100644
index 3ac0d912f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@2x.png
deleted file mode 100644
index e859ad5e3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@3x.png
deleted file mode 100644
index 7af25a18a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/elevator.imageset/elevator@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/Contents.json
index 8fd3d6771..b072d500c 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"embassy@1x.png","idiom":"universal","scale":"1x"},{"filename":"embassy@2x.png","idiom":"universal","scale":"2x"},{"filename":"embassy@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"embassy.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy.svg
new file mode 100644
index 000000000..d1fb83f89
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="embassy" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6.65,2C5.43,2,4.48,3.38,4.11,3.82C4.0365,3.9102,3.9975,4.0237,4,4.14v4.4C3.9884,8.7827,4.1758,8.9889,4.4185,9.0005&#xA;&#x9;C4.528,9.0057,4.6355,8.9699,4.72,8.9c0.4665-0.6264,1.1589-1.0461,1.93-1.17C8.06,7.73,8.6,9,10.07,9&#xA;&#x9;c0.9948-0.0976,1.9415-0.4756,2.73-1.09c0.1272-0.0934,0.2016-0.2422,0.2-0.4V2.45c0.0275-0.2414-0.1459-0.4595-0.3874-0.487&#xA;&#x9;C12.5332,1.954,12.4527,1.9668,12.38,2c-0.6813,0.5212-1.4706,0.8834-2.31,1.06C8.6,3.08,8.12,2,6.65,2z M2.5,3&#xA;&#x9;c-0.5523,0-1-0.4477-1-1s0.4477-1,1-1s1,0.4477,1,1S3.0523,3,2.5,3z M3,4v9.48c0,0.2761-0.2239,0.5-0.5,0.5S2,13.7561,2,13.48V4&#xA;&#x9;c0-0.2761,0.2239-0.5,0.5-0.5S3,3.7239,3,4z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@1x.png
deleted file mode 100644
index b6b6e74de..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@2x.png
deleted file mode 100644
index 7b4b03ca2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@3x.png
deleted file mode 100644
index 03b55106e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/embassy.imageset/embassy@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/emergency-phone.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/emergency-phone.imageset/Contents.json
new file mode 100644
index 000000000..c9068cc5e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/emergency-phone.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"emergency-phone.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/emergency-phone.imageset/emergency-phone.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/emergency-phone.imageset/emergency-phone.svg
new file mode 100644
index 000000000..4c2220cd1
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/emergency-phone.imageset/emergency-phone.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="emergency-phone" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M7.875,11.49a.51.51,0,0,0,.72,0l.72-.72,2.18,2.16-.37.37a2.24,2.24,0,0,1-1.44.7H8.24a2.24,2.24,0,0,1-1.45-.7L1.72,8.23A2.24,2.24,0,0,1,1,6.78V5.33a2.24,2.24,0,0,1,.72-1.45l.36-.36L4.26,5.69l-.73.73a.51.51,0,0,0,0,.72Zm4.72.38a1,1,0,0,0,.036-1.414h0l-.036-.036-.72-.72a1,1,0,0,0-1.414-.036h0l-.036.036ZM5.315,4.62a1,1,0,0,0,.036-1.414h0L4.595,2.45a1,1,0,0,0-1.414-.036h0L3.14,2.45ZM10,2V4H8V5h2V7h1V5h2V4H11V2Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/Contents.json
index ede455f4a..3680ae7c2 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"entrance-alt1@1x.png","idiom":"universal","scale":"1x"},{"filename":"entrance-alt1@2x.png","idiom":"universal","scale":"2x"},{"filename":"entrance-alt1@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"entrance-alt1.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1.svg
new file mode 100644
index 000000000..b7c4b8bab
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="entrance-alt1" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6.554,9.639a.5.5,0,0,0,.707.707L9.928,7.669a.25.25,0,0,0,0-.354h0L7.261,4.639a.5.5,0,0,0-.707.707L8.2,7H1.5a.5.5,0,0,0,0,1H8.2ZM12,1H5.5a.5.5,0,0,0,0,1h6a.5.5,0,0,1,.5.5v10a.5.5,0,0,1-.5.5H5.25a.5.5,0,0,0,0,1H12a1,1,0,0,0,1-1V2A1,1,0,0,0,12,1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@1x.png
deleted file mode 100644
index dd28be581..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@2x.png
deleted file mode 100644
index eae0ca58a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@3x.png
deleted file mode 100644
index 736ce2238..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance-alt1.imageset/entrance-alt1@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/Contents.json
index b3e622043..f9635115c 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"entrance@1x.png","idiom":"universal","scale":"1x"},{"filename":"entrance@2x.png","idiom":"universal","scale":"2x"},{"filename":"entrance@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"entrance.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance.svg
new file mode 100644
index 000000000..cf1a73a8a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="entrance">
+  <path d="m8 6.5v-1c0-.26522-.10536-.51957-.29289-.70711-.18754-.18753-.44189-.29289-.70711-.29289s-.51957.10536-.70711.29289c-.18753.18754-.29289.44189-.29289.70711v3zm-2-3.5c0-.19778.05865-.39112.16853-.55557s.26606-.29262.44879-.36831c.18272-.07569.38379-.09549.57777-.0569.19398.03858.37216.13382.51202.27367.13985.13986.23509.31804.27368.51202.03858.19398.01878.39505-.05691.57777-.07569.18273-.20386.33891-.36831.44879s-.35779.16853-.55557.16853c-.26522 0-.51957-.10536-.70711-.29289-.18753-.18754-.29289-.44189-.29289-.70711zm9 3c0 .26522-.1054.51957-.2929.70711-.1875.18753-.4419.29289-.7071.29289h-1.58c-.1316-.00076-.2621.02446-.3839.07423-.1218.04976-.2327.12309-.3261.21577l-5.42 5.42c-.18626.1847-.43766.2889-.7.29h-2.59c-.26522 0-.51957-.1054-.70711-.2929-.18753-.1875-.29289-.4419-.29289-.7071s.10536-.5196.29289-.7071c.18754-.1875.44189-.2929.70711-.2929h1.59c.26234-.0011.51374-.1053.7-.29l5.42-5.42c.0934-.09268.2043-.16601.3261-.21577.1218-.04977.2523-.07499.3839-.07423h2.58c.2652 0 .5196.10536.7071.29289.1875.18754.2929.44189.2929.70711z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@1x.png
deleted file mode 100644
index b30234df9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@2x.png
deleted file mode 100644
index 0b80c5587..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@3x.png
deleted file mode 100644
index ca08ba079..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/entrance.imageset/entrance@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/Contents.json
index 23e5b8cd1..cc871345f 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"farm@1x.png","idiom":"universal","scale":"1x"},{"filename":"farm@2x.png","idiom":"universal","scale":"2x"},{"filename":"farm@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"farm.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm.svg
new file mode 100644
index 000000000..e4cab89d6
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="farm">
+  <path d="m8 6-3-2-3 2-1 2v4h2v-2h4v2h2v-4zm-2 2h-2v-2h2zm8 4h-3v-9.5c0-.39782.158-.77936.4393-1.06066s.6629-.43934 1.0607-.43934.7794.15804 1.0607.43934.4393.66284.4393 1.06066z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@1x.png
deleted file mode 100644
index a37c109c8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@2x.png
deleted file mode 100644
index c67d15260..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@3x.png
deleted file mode 100644
index 55bf52be7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/farm.imageset/farm@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fast-food.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/fast-food.imageset/Contents.json
new file mode 100644
index 000000000..9ea0cd6ae
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fast-food.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"fast-food.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fast-food.imageset/fast-food.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/fast-food.imageset/fast-food.svg
new file mode 100644
index 000000000..08e020a5d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fast-food.imageset/fast-food.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="fast-food" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M14,8c0,0.5523-0.4477,1-1,1H2C1.4477,9,1,8.5523,1,8s0.4477-1,1-1h11C13.5523,7,14,7.4477,14,8z M3.5,10H2&#xA;&#x9;c0,1.6569,1.3431,3,3,3h5c1.6569,0,3-1.3431,3-3H3.5z M3,6H2V4c0-1.1046,0.8954-2,2-2h7c1.1046,0,2,0.8954,2,2v2H3z M11,4.5&#xA;&#x9;C11,4.7761,11.2239,5,11.5,5S12,4.7761,12,4.5S11.7761,4,11.5,4S11,4.2239,11,4.5z M9,3.5C9,3.7761,9.2239,4,9.5,4S10,3.7761,10,3.5&#xA;&#x9;S9.7761,3,9.5,3S9,3.2239,9,3.5z M7,4.5C7,4.7761,7.2239,5,7.5,5S8,4.7761,8,4.5S7.7761,4,7.5,4S7,4.2239,7,4.5z M5,3.5&#xA;&#x9;C5,3.7761,5.2239,4,5.5,4S6,3.7761,6,3.5S5.7761,3,5.5,3S5,3.2239,5,3.5z M3,4.5C3,4.7761,3.2239,5,3.5,5S4,4.7761,4,4.5&#xA;&#x9;S3.7761,4,3.5,4S3,4.2239,3,4.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/Contents.json
index 685722ce9..2c01d8381 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"fence@1x.png","idiom":"universal","scale":"1x"},{"filename":"fence@2x.png","idiom":"universal","scale":"2x"},{"filename":"fence@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"fence.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence.svg
new file mode 100644
index 000000000..f9d7f6ae5
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="fence">
+  <path d="m13.5 9h-.5v-3h.5c.1326 0 .2598-.05268.3536-.14644.0937-.09377.1464-.22095.1464-.35356s-.0527-.25978-.1464-.35355c-.0938-.09377-.221-.14645-.3536-.14645h-.5v-2l-.286-.573c-.0218-.03651-.0525-.06683-.0894-.08809-.0368-.02125-.0784-.03273-.1209-.03333s-.0845.00969-.1219.0299c-.0374.0202-.069.04964-.0918.08552l-.29.579v2h-1v-2l-.286-.573c-.0218-.03651-.0525-.06683-.0894-.08809-.0368-.02125-.0784-.03273-.1209-.03333s-.0845.00969-.1219.0299c-.0374.0202-.069.04964-.0918.08552l-.29.579v2h-1v-2l-.286-.573c-.02178-.03651-.05254-.06683-.08936-.08809-.03681-.02125-.07846-.03273-.12096-.03333-.04251-.0006-.08446.00969-.12187.0299-.0374.0202-.06901.04964-.09181.08552l-.29.579v2h-1v-2l-.286-.573c-.02178-.03651-.05254-.06683-.08936-.08809-.03681-.02125-.07846-.03273-.12096-.03333-.04251-.0006-.08446.00969-.12187.0299-.0374.0202-.06901.04964-.09181.08552l-.29.579v2h-1v-2l-.286-.573c-.02178-.03651-.05254-.06683-.08936-.08809-.03681-.02125-.07846-.03273-.12096-.03333-.04251-.0006-.08446.00969-.12187.0299-.0374.0202-.06901.04964-.09181.08552l-.29.579v2h-1v-2l-.286-.573c-.02178-.03651-.05254-.06683-.08936-.08809-.03681-.02125-.07846-.03273-.12096-.03333-.04251-.0006-.08446.00969-.12187.0299-.0374.0202-.06901.04964-.09181.08552l-.29.579v2h-.5c-.13261 0-.25979.05268-.35355.14645-.09377.09377-.14645.22094-.14645.35355s.05268.25979.14645.35356c.09376.09376.22094.14644.35355.14644h.5v3h-.5c-.13261 0-.25979.05268-.35355.14645-.09377.09377-.14645.22094-.14645.35355s.05268.25979.14645.35356c.09376.09376.22094.14644.35355.14644h.5v1.5c0 .1326.05268.2598.14645.3536.09376.0937.22094.1464.35355.1464s.25979-.0527.35355-.1464c.09377-.0938.14645-.221.14645-.3536v-1.5h1v1.5c0 .1326.05268.2598.14645.3536.09376.0937.22094.1464.35355.1464s.25979-.0527.35355-.1464c.09377-.0938.14645-.221.14645-.3536v-1.5h1v1.5c0 .1326.05268.2598.14645.3536.09376.0937.22094.1464.35355.1464s.25979-.0527.35355-.1464c.09377-.0938.14645-.221.14645-.3536v-1.5h1v1.5c0 .1326.05268.2598.14645.3536.09376.0937.22094.1464.35355.1464s.25979-.0527.35355-.1464c.09377-.0938.14645-.221.14645-.3536v-1.5h1v1.5c0 .1326.0527.2598.1464.3536.0938.0937.221.1464.3536.1464s.2598-.0527.3536-.1464c.0937-.0938.1464-.221.1464-.3536v-1.5h1v1.5c0 .1326.0527.2598.1464.3536.0938.0937.221.1464.3536.1464s.2598-.0527.3536-.1464c.0937-.0938.1464-.221.1464-.3536v-1.5h.5c.1326 0 .2598-.05268.3536-.14644.0937-.09377.1464-.22095.1464-.35356s-.0527-.25978-.1464-.35355c-.0938-.09377-.221-.14645-.3536-.14645zm-10.5 0v-3h1v3zm2 0v-3h1v3zm2 0v-3h1v3zm2 0v-3h1v3zm2 0v-3h1v3z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@1x.png
deleted file mode 100644
index 58f2f30df..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@2x.png
deleted file mode 100644
index 7b870e128..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@3x.png
deleted file mode 100644
index f5ccac2a4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fence.imageset/fence@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/Contents.json
index 8556e3a2f..c7575d0ae 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"ferry-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"ferry-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"ferry-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"ferry-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP.svg
new file mode 100644
index 000000000..9fd7cf023
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="ferry-JP">
+  <path d="M9.5 12.5H5.5L5.5 8C5.5 6.91153 6.07979 5.44812 6.85389 4.13809C7.07346 3.76652 7.29495 3.43049 7.5 3.1451C7.70505 3.43049 7.92654 3.76652 8.14611 4.13809C8.92021 5.44812 9.5 6.91153 9.5 8V12.5ZM7.5 1C7 1 4 5 4 8V12.5C4 13.3284 4.67157 14 5.5 14H9.5C10.3284 14 11 13.329 11 12.5006V8C11 5 8 1 7.5 1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@1x.png
deleted file mode 100644
index fce0347b6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@2x.png
deleted file mode 100644
index 61ca09a2b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@3x.png
deleted file mode 100644
index 336352272..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry-JP.imageset/ferry-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/Contents.json
index 423ce362d..ec80f1634 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"ferry@1x.png","idiom":"universal","scale":"1x"},{"filename":"ferry@2x.png","idiom":"universal","scale":"2x"},{"filename":"ferry@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"ferry.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry.svg
new file mode 100644
index 000000000..813639522
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="ferry" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M5.33,11c0.6745,0.009,1.3262,0.245,1.85,0.67l0.26,0.23h0.05l0.31-0.28c0.9817-0.8115,2.379-0.8846,3.44-0.18L13.5,7L12,6&#xA;&#x9;V2.45c-0.0466-0.8-0.6989-1.4305-1.5-1.45H10c0.0343-0.518-0.3579-0.9657-0.8759-1C9.0828-0.0027,9.0413-0.0027,9,0H6&#xA;&#x9;C5.482-0.0343,5.0343,0.3579,5,0.8759C4.9973,0.9172,4.9973,0.9587,5,1H4.5C3.6989,1.0195,3.0466,1.65,3,2.45V6L1.5,7l2.25,4.53&#xA;&#x9;C4.2143,11.2041,4.7631,11.02,5.33,11z M4,2.45c0.0105-0.2594,0.2293-0.4611,0.4886-0.4506C4.4924,1.9996,4.4962,1.9998,4.5,2h6&#xA;&#x9;c0.259-0.0171,0.4829,0.1789,0.5,0.4379c0.0014,0.0207,0.0014,0.0414,0,0.0621v3l-3.5-2L4,5.45C4,5.45,4,2.45,4,2.45z M14,13v1&#xA;&#x9;c-0.2626,0.0194-0.5069,0.1416-0.68,0.34c-0.2717,0.2883-0.6178,0.4959-1,0.6c-0.6147,0.1815-1.2795,0.0425-1.77-0.37l-0.39-0.35&#xA;&#x9;c-0.3043-0.3026-0.7957-0.3026-1.1,0c-0.14,0.12-0.27,0.25-0.42,0.37c-0.7328,0.5856-1.7814,0.556-2.48-0.07l-0.39-0.35&#xA;&#x9;c-0.2864-0.2502-0.7136-0.2502-1,0c-0.19,0.15-0.36,0.32-0.55,0.47c-0.7043,0.5215-1.6732,0.4968-2.35-0.06l-0.31-0.27&#xA;&#x9;C1.4153,14.1443,1.2172,14.0346,1,14v-1c0.2585-0.032,0.5205,0.0169,0.75,0.14c0.2782,0.1722,0.5424,0.3661,0.79,0.58&#xA;&#x9;c0.2051,0.2235,0.5147,0.319,0.81,0.25c0.1125-0.0333,0.2177-0.0876,0.31-0.16c0.16-0.12,0.29-0.26,0.45-0.39&#xA;&#x9;c0.7106-0.5888,1.7394-0.5888,2.45,0c0.16,0.13,0.31,0.28,0.47,0.41c0.2864,0.2502,0.7136,0.2502,1,0c0.16-0.13,0.31-0.28,0.47-0.41&#xA;&#x9;c0.7123-0.5943,1.7477-0.5943,2.46,0c0.15,0.13,0.29,0.27,0.44,0.39c0.2864,0.2502,0.7136,0.2502,1,0l0.47-0.41&#xA;&#x9;C13.1895,13.1408,13.5886,12.9995,14,13z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@1x.png
deleted file mode 100644
index d356d5741..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@2x.png
deleted file mode 100644
index 306090d0d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@3x.png
deleted file mode 100644
index bed75dedf..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ferry.imageset/ferry@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/Contents.json
index 667b78aa5..8ce564b8f 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"fire-station-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"fire-station-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"fire-station-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"fire-station-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP.svg
new file mode 100644
index 000000000..e5cb24946
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="fire-station-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M8.5,8.1489V11.75a1,1,0,0,1-2,0V8.1489A5.0084,5.0084,0,0,1,2.5,3.25a1,1,0,0,1,2,0,3,3,0,0,0,6,0,1,1,0,0,1,2,0A5.0082,5.0082,0,0,1,8.5,8.1489Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@1x.png
deleted file mode 100644
index 7432c84dd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@2x.png
deleted file mode 100644
index 9165c4d8e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@3x.png
deleted file mode 100644
index 13c0074c6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station-JP.imageset/fire-station-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/Contents.json
index 77764d06e..065caf22e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"fire-station@1x.png","idiom":"universal","scale":"1x"},{"filename":"fire-station@2x.png","idiom":"universal","scale":"2x"},{"filename":"fire-station@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"fire-station.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station.svg
new file mode 100644
index 000000000..17dfe9fd7
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="fire-station">
+  <path d="M7.5 14C11.0899 14 14 11 14 7.50003C14 4.5 11.5 2 11.5 2L10.5 5.5L7.5 1L4.5 5.5L3.5 2C3.5 2 1 4.5 1 7.50003C1 11 3.91015 14 7.5 14ZM7.5 12.5C6.11929 12.5 5 11.3807 5 10C5 8.61929 7.5 5.5 7.5 5.5C7.5 5.5 10 8.61929 10 10C10 11.3807 8.88071 12.5 7.5 12.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@1x.png
deleted file mode 100644
index 45131004f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@2x.png
deleted file mode 100644
index 876b0c4c6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@3x.png
deleted file mode 100644
index be4bbda96..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/fire-station.imageset/fire-station@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fitness-centre.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/fitness-centre.imageset/Contents.json
new file mode 100644
index 000000000..60954f511
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fitness-centre.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"fitness-centre.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fitness-centre.imageset/fitness-centre.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/fitness-centre.imageset/fitness-centre.svg
new file mode 100644
index 000000000..6e734d0fd
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fitness-centre.imageset/fitness-centre.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="fitness-centre" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="daec40ff-71f5-4432-9d75-dcba7b9c1b89" d="M14.5,7V8h-1v2h-1v1H11V8H4v3H2.5V10h-1V8H.5V7h1V5h1V4H4V7h7V4h1.5V5h1V7Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/Contents.json
index 9985f6550..810221853 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"florist@1x.png","idiom":"universal","scale":"1x"},{"filename":"florist@2x.png","idiom":"universal","scale":"2x"},{"filename":"florist@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"florist.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist.svg
new file mode 100644
index 000000000..a9b83e994
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="florist" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M1.5,1A2.7,2.7,0,0,1,4,3l.5-3L5,3A2.7,2.7,0,0,1,7.5,1c-.2.03-1,.26-1,2v.083A1.959,1.959,0,0,1,4.5,5H4.417A1.959,1.959,0,0,1,2.5,3C2.5,1.261,1.7,1.03,1.5,1ZM12.012,11l3-.5-3-.5A2.686,2.686,0,0,0,14,7.5c-.03.2-.248,1-1.988,1a2,2,0,0,0,0,4c1.739,0,1.958.8,1.988,1A2.686,2.686,0,0,0,12.012,11ZM9.688,5.548a1,1,0,0,1,0-2,1,1,0,0,1,0-2,.986.986,0,0,1,.852.507l.023-.012a.978.978,0,0,1-.116-.444,1,1,0,1,1,2,0,.978.978,0,0,1-.116.444l.019.01a.986.986,0,0,1,.85-.5,1,1,0,0,1,.025,2,1,1,0,0,1-.025,2,.986.986,0,0,1-.85-.5l-.016.009a.978.978,0,0,1,.113.44,1,1,0,0,1-2,0,.978.978,0,0,1,.113-.44l-.02-.011a.986.986,0,0,1-.852.507Zm.71-1.995A1.051,1.051,0,1,0,11.449,2.5,1.051,1.051,0,0,0,10.4,3.553v0ZM4.946,11.444l-.516-.515L8.892,6.475A1.746,1.746,0,0,1,8.44,6.22L4.076,10.575l-.519-.518A16.051,16.051,0,0,0,4.912,6a3.373,3.373,0,0,1-.412.035c-.041,0-.073-.008-.112-.01A16.953,16.953,0,0,1,3.131,9.631L2.76,9.26a.246.246,0,0,0-.4.079L.231,14.445a.287.287,0,0,0-.016.089.25.25,0,0,0,.25.25.289.289,0,0,0,.1-.019l5.1-2.124a.246.246,0,0,0,.079-.4l-.372-.372a16.874,16.874,0,0,1,3.612-1.256c0-.059-.015-.106-.015-.166A3.349,3.349,0,0,1,9,10.089,16.076,16.076,0,0,0,4.946,11.444Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@1x.png
deleted file mode 100644
index 92ef9f214..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@2x.png
deleted file mode 100644
index dcfcb930f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@3x.png
deleted file mode 100644
index 15acbce88..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/florist.imageset/florist@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fuel.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/fuel.imageset/Contents.json
new file mode 100644
index 000000000..1778c43dd
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fuel.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"fuel.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/fuel.imageset/fuel.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/fuel.imageset/fuel.svg
new file mode 100644
index 000000000..fcb783d68
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/fuel.imageset/fuel.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="fuel">
+  <path d="m14 6v5.5c0 .2761-.2239.5-.5.5s-.5-.2239-.5-.5v-2c0-.8284-.6716-1.5-1.5-1.5h-1.5v-6c0-.5523-.4477-1-1-1h-6c-.5523 0-1 .4477-1 1v11c0 .5523.4477 1 1 1h6c.5523 0 1-.4477 1-1v-4h1.5c.2761 0 .5.2239.5.5v2c0 .8284.6716 1.5 1.5 1.5s1.5-.6716 1.5-1.5v-6.5c0-.5523-.4477-1-1-1v-1.51c-.0054-.2722-.2277-.4901-.5-.49-.2816.0047-.5062.2367-.5015.5184.0002.0105.0007.0211.0015.0316v2.45c0 .5523.4477 1 1 1s1-.4477 1-1-.4477-1-1-1zm-5 .5c0 .2761-.2239.5-.5.5h-5c-.2761 0-.5-.2239-.5-.5v-3c0-.2761.2239-.5.5-.5h5c.2761 0 .5.2239.5.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/Contents.json
index f2afec2cd..e56e5dbf8 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"furniture@1x.png","idiom":"universal","scale":"1x"},{"filename":"furniture@2x.png","idiom":"universal","scale":"2x"},{"filename":"furniture@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"furniture.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture.svg
new file mode 100644
index 000000000..8c8eebc1f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="furniture">
+  <path d="m8.69099 10.142v-1.642c0-.13261-.05268-.25979-.14645-.35355-.09377-.09377-.22094-.14645-.35355-.14645h-1c-.13261 0-.25979.05268-.35356.14645-.09376.09376-.14644.22094-.14644.35355v1.641c-.75987.1945-1.4456.6085-1.9715 1.1905-.52591.5819-.86868 1.3059-.9855 2.0815-.01141.0723-.00702.1462.01285.2167.01987.0704.05476.1357.10227.1914s.10651.1004.17295.1311c.06643.0307.13873.0467.21193.0468h6.92201c.0732-.0001.1455-.0161.2119-.0468.0665-.0307.1255-.0754.173-.1311s.0824-.121.1022-.1914c.0199-.0705.0243-.1444.0129-.2167-.1176-.7765-.4616-1.501-.989-2.0828-.5275-.5819-1.2148-.9952-1.97601-1.1882zm4.63901-3.863-2.5-5c-.0412-.08351-.1048-.15387-.1838-.20316s-.1701-.07556-.2632-.07584h-5.38401c-.09261.00019-.18335.02609-.2621.07483-.07875.04873-.14241.11837-.1839.20117l-2.5 5c-.03809.076-.05617.16046-.05253.24539.00363.08494.02886.16754.07331.24001.04444.07247.10663.13241.18068.17416s.15753.06393.24254.06444h8.19401v1.5c0 .13261.0527.25979.1464.35355.0938.09377.221.14645.3536.14645s.2598-.05268.3535-.14645c.0938-.09376.1465-.22094.1465-.35355v-1.5h1.194c.0847-.00059.1678-.02269.2416-.06421s.1359-.1011.1804-.17317c.0444-.07207.0699-.15425.0739-.23884s-.0135-.16882-.0509-.24478z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@1x.png
deleted file mode 100644
index 6ab5832a2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@2x.png
deleted file mode 100644
index f538d474d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@3x.png
deleted file mode 100644
index 6f1412268..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/furniture.imageset/furniture@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/Contents.json
index 1ce8f16bb..ce15cb333 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"gaming@1x.png","idiom":"universal","scale":"1x"},{"filename":"gaming@2x.png","idiom":"universal","scale":"2x"},{"filename":"gaming@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"gaming.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming.svg
new file mode 100644
index 000000000..3d47ab05c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="gaming">
+  <path d="m13.1 11.5c-.6.3-1.4.1-1.8-.5l-1.1-1.4h-5.40002l-1.1 1.4c-.5.7-1.4.8-2.1.3-.5-.4-.700004-1-.600004-1.5l.700004-3.7c.2-1.2 1.3-2.1 2.5-2.1h2.8v-1.5c0-.8.6-1.5 1.4-1.5h3.10002c.3 0 .5.2.5.5s-.2.5-.5.5h-3.00002c-.3 0-.5.2-.5.4v.1 1.5h2.80002c1.2 0 2.3.9 2.5 2.1l.7 3.7c.1.7-.2 1.4-.9 1.7zm-7.10002-5c0-.8-.7-1.5-1.5-1.5s-1.5.7-1.5 1.5.7 1.5 1.5 1.5 1.5-.7 1.5-1.5zm6.00002 0c0-.3-.2-.5-.5-.5h-.5v-.5c0-.3-.2-.5-.5-.5s-.50002.2-.50002.5v.5h-.5c-.3 0-.5.2-.5.5s.2.5.5.5h.5v.5c0 .3.20002.5.50002.5s.5-.2.5-.5v-.5h.5c.3 0 .5-.2.5-.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@1x.png
deleted file mode 100644
index 582d1904b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@2x.png
deleted file mode 100644
index 86d0863b7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@3x.png
deleted file mode 100644
index 5c933187e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/gaming.imageset/gaming@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/Contents.json
index 70081e7b4..733c89dc8 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"garden-centre@1x.png","idiom":"universal","scale":"1x"},{"filename":"garden-centre@2x.png","idiom":"universal","scale":"2x"},{"filename":"garden-centre@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"garden-centre.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre.svg
new file mode 100644
index 000000000..b5b717a78
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" id="garden-centre">
+  <path d="M4,5L4,4.5C4,3.12 5.12,2 6.5,2C7.88,2 9,3.12 9,4.5L9,10.293L11.365,7.928L11.018,6.633C11.018,6.631 11.017,6.629 11.017,6.627L11.016,6.627L11.016,6.627C10.973,6.461 11.016,6.276 11.147,6.146C11.342,5.951 11.659,5.951 11.854,6.146L13.854,8.146C14.049,8.341 14.049,8.658 13.854,8.853C13.724,8.983 13.541,9.027 13.375,8.984C13.375,8.984 13.375,8.984 13.375,8.984C13.372,8.983 13.369,8.982 13.365,8.981L12.072,8.635L9,11.707L9,12C9,12.552 8.552,13 8,13L5,13C4.448,13 4,12.552 4,12L4,11.536L1.732,9.268C0.757,8.292 0.757,6.708 1.732,5.732C2.22,5.244 2.86,5 3.5,5L3.5,5L4,5ZM4,6L3.5,6L3.5,6C3.116,6 2.732,6.147 2.439,6.439C1.854,7.025 1.854,7.975 2.439,8.561L4,10.121L4,6ZM8,5L8,4.5C8,3.672 7.328,3 6.5,3C5.672,3 5,3.672 5,4.5L5,5L8,5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@1x.png
deleted file mode 100644
index a593b0b60..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@2x.png
deleted file mode 100644
index 191ba6b31..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@3x.png
deleted file mode 100644
index e1785a5f2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden-centre.imageset/garden-centre@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/Contents.json
index 5502c7bfc..4d6ebf4c7 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"garden@1x.png","idiom":"universal","scale":"1x"},{"filename":"garden@2x.png","idiom":"universal","scale":"2x"},{"filename":"garden@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"garden.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden.svg
new file mode 100644
index 000000000..79b19f7ef
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="garden" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13,8c0,3.31-2.19,6-5.5,6S2,11.31,2,8c2.2643,0.0191,4.2694,1.4667,5,3.61V7H4.5C3.6716,7,3,6.3284,3,5.5v-3&#xA;&#x9;C3,2.2239,3.2239,2,3.5,2c0.1574,0,0.3056,0.0741,0.4,0.2l1.53,2l1.65-3c0.1498-0.232,0.4593-0.2985,0.6913-0.1487&#xA;&#x9;C7.8308,1.0898,7.8815,1.1404,7.92,1.2l1.65,3l1.53-2c0.1657-0.2209,0.4791-0.2657,0.7-0.1C11.9259,2.1944,12,2.3426,12,2.5v3&#xA;&#x9;C12,6.3284,11.3284,7,10.5,7H8v4.61C8.7306,9.4667,10.7357,8.0191,13,8z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@1x.png
deleted file mode 100644
index 439300265..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@2x.png
deleted file mode 100644
index c06e95cb5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@3x.png
deleted file mode 100644
index 405e249b8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/garden.imageset/garden@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gate.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/gate.imageset/Contents.json
new file mode 100644
index 000000000..3f87241b9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/gate.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"gate.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gate.imageset/gate.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/gate.imageset/gate.svg
new file mode 100644
index 000000000..1a1b99c15
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/gate.imageset/gate.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="gate">
+  <path d="M1 2.75A.75.75 0 0 1 1.75 2h1.114c.09 0 .18.016.263.048l3.386 1.27A.75.75 0 0 1 7 4.02v5.96a.75.75 0 0 1-.487.702L3 12v.25a.75.75 0 0 1-.75.75h-.5a.75.75 0 0 1-.75-.75v-9.5Zm3 5.736v-4.87a.25.25 0 0 0-.162-.234l-.5-.187A.25.25 0 0 0 3 3.429v5.224c0 .17.167.291.33.237l.5-.166A.25.25 0 0 0 4 8.486ZM5 4.18v3.807a.25.25 0 0 0 .33.238l.5-.167A.25.25 0 0 0 6 7.82V4.366a.25.25 0 0 0-.162-.234l-.5-.187A.25.25 0 0 0 5 4.179Zm9-1.43a.75.75 0 0 0-.75-.75h-1.114a.75.75 0 0 0-.263.048l-3.386 1.27A.75.75 0 0 0 8 4.02v5.96a.75.75 0 0 0 .487.702L12 12v.25c0 .414.336.75.75.75h.5a.75.75 0 0 0 .75-.75v-9.5Zm-2.83 5.974a.25.25 0 0 1-.17-.238v-4.87a.25.25 0 0 1 .162-.234l.5-.187a.25.25 0 0 1 .338.234v5.224a.25.25 0 0 1-.33.237l-.5-.166ZM10 4.179v3.807a.25.25 0 0 1-.33.238l-.5-.167A.25.25 0 0 1 9 7.82V4.366a.25.25 0 0 1 .162-.234l.5-.187a.25.25 0 0 1 .338.234Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/Contents.json
index 9528c2fd3..3886dbcce 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"gift@1x.png","idiom":"universal","scale":"1x"},{"filename":"gift@2x.png","idiom":"universal","scale":"2x"},{"filename":"gift@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"gift.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift.svg
new file mode 100644
index 000000000..b2f68c7dc
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="gift">
+  <path d="M10.5 1.00152C9.0967.957116 7.8503 1.89192 7.5 3.25152 7.1497 1.89192 5.9033.957116 4.5 1.00152 2.7678.947006 2.23515 2.79746 2.81831 4H1.5C1.22386 4 1 4.22386 1 4.5V5.5C1 5.77614 1.22386 6 1.5 6H13.5C13.7761 6 14 5.77614 14 5.5V4.5C14 4.22386 13.7761 4 13.5 4H12.1938C12.8 2.81516 12.2922 1.00143 10.5404 1.00112 10.5269 1.00112 10.5135 1.00122 10.5 1.00152ZM10.6831 4H8.5C8.50082 2.8961 9.3959 2.00152 10.5 2.00152 11.675 2.00152 11.8827 3.87414 10.6831 4ZM6.5 4H4.29187C3.25675 3.88256 3.19576 2.10553 4.3323 2.00152 4.3881 1.99642 4.4442 1.99642 4.5 2.00152 5.60409 2.00152 6.49918 2.8961 6.5 4ZM2 7.00146V11.5015C2 12.3299 2.6716 13.0015 3.5 13.0015H6.5V7.00146H2ZM8.5 7.00146V13.0015H11.5C12.3284 13.0015 13 12.3299 13 11.5015V7.00146H8.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@1x.png
deleted file mode 100644
index e979617fa..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@2x.png
deleted file mode 100644
index 42f7d72cd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@3x.png
deleted file mode 100644
index 4a35d52ca..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/gift.imageset/gift@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/Contents.json
index 682844fca..0646e1536 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"globe@1x.png","idiom":"universal","scale":"1x"},{"filename":"globe@2x.png","idiom":"universal","scale":"2x"},{"filename":"globe@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"globe.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe.svg
new file mode 100644
index 000000000..321211045
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="globe">
+  <path d="M11.981,9.481,11.26,8.76A4.979,4.979,0,1,1,4.24,1.74l-.721-.721A5.991,5.991,0,0,0,7,11.475V13H6.5a.5.5,0,0,0,0,1h2a.5.5,0,0,0,0-1H8V11.473A5.983,5.983,0,0,0,11.981,9.481ZM7.5,9A3.5,3.5,0,1,0,4,5.5,3.5,3.5,0,0,0,7.5,9Zm1-5,.364-.592a2.5,2.5,0,0,1,.823.9L9.5,5h-1ZM6.656,3.156,7.5,4V5L8,6H9.94a2.494,2.494,0,0,1-1.5,1.814L8,7H6.5L5.05,5A2.5,2.5,0,0,1,6.656,3.156Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@1x.png
deleted file mode 100644
index 0df720d54..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@2x.png
deleted file mode 100644
index 7dcaee3d6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@3x.png
deleted file mode 100644
index abee2e674..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/globe.imageset/globe@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/Contents.json
index dce616c09..e0bedf972 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"golf@1x.png","idiom":"universal","scale":"1x"},{"filename":"golf@2x.png","idiom":"universal","scale":"2x"},{"filename":"golf@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"golf.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf.svg
new file mode 100644
index 000000000..38e379395
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="golf" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path11758" d="&#xA;&#x9;M3.3999,1.1c0,0.1,0,0.2,0,0.2c0,0.4,0.3,0.7,0.7,0.7c0.3,0,0.5-0.2,0.6-0.5l0,0L4.9,1l5.6,2.3L6.6,6C6.2,6.3,6.2,6.7,6.3,7.1&#xA;&#x9;l0.9,2.1l-1.3,3.9C5.7,13.6,6.1,14,6.5,14c0.3,0,0.5-0.1,0.6-0.5l1.4-4l0.1,0.3v3.5c0,0,0,0.7,0.7,0.7s0.7-0.7,0.7-0.7V10&#xA;&#x9;c0-0.2,0-0.3-0.1-0.5L8.5,6.1l2.7-1.9c0.2-0.2,0.4-0.3,0.4-0.6s-0.2-0.5-0.4-0.6L4,0.1c-0.0878,0-0.118,0.0179-0.2001,0.1&#xA;&#x9;L3.3999,1.1z M5.5,3C4.7,3,4,3.7,4,4.5S4.7,6,5.5,6S7,5.3,7,4.5S6.2999,3,5.5,3z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@1x.png
deleted file mode 100644
index e30fac111..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@2x.png
deleted file mode 100644
index 07b2f7c4b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@3x.png
deleted file mode 100644
index 7cbe54163..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/golf.imageset/golf@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/grocery.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/grocery.imageset/Contents.json
new file mode 100644
index 000000000..4cedc7763
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/grocery.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"grocery.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/grocery.imageset/grocery.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/grocery.imageset/grocery.svg
new file mode 100644
index 000000000..8bf2ecdbb
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/grocery.imageset/grocery.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" id="grocery" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M 13.199219 1.5 C 13.199219 1.5 11.808806 1.4588 11.253906 2 C 10.720406 2.5202 10.5 2.9177 10.5 4 L 1.1992188 4 L 2.59375 8.8144531 C 2.59725 8.8217531 2.6036219 8.8287375 2.6074219 8.8359375 C 2.8418219 9.4932375 3.4545469 9.9666406 4.1855469 9.9941406 C 4.1885469 9.9954406 4.1992187 10 4.1992188 10 L 10.699219 10 L 10.699219 10.199219 C 10.699219 10.199219 10.7 10.500391 10.5 10.900391 C 10.3 11.300391 10.200391 11.5 9.4003906 11.5 L 2.9003906 11.5 C 1.9003906 11.5 1.9003906 13 2.9003906 13 L 4.0996094 13 L 4.1992188 13 L 9.0996094 13 L 9.1992188 13 L 9.3007812 13 C 10.500781 13 11.399219 12.299609 11.699219 11.599609 C 11.999219 10.899609 12 10.300781 12 10.300781 L 12 10 L 12 4 C 12 3.4764 12.228619 3 12.699219 3 L 13.25 3 C 13.6642 3 14 2.6642 14 2.25 C 14 1.8358 13.6642 1.5 13.25 1.5 L 13.199219 1.5 z M 9.1992188 13 C 8.5992188 13 8.1992188 13.4 8.1992188 14 C 8.1992188 14.6 8.5992187 15 9.1992188 15 C 9.7992187 15 10.199219 14.6 10.199219 14 C 10.199219 13.4 9.7992188 13 9.1992188 13 z M 4.1992188 13 C 3.5992188 13 3.1992188 13.4 3.1992188 14 C 3.1992188 14.6 3.5992187 15 4.1992188 15 C 4.7992188 15 5.1992188 14.6 5.1992188 14 C 5.1992188 13.4 4.7992187 13 4.1992188 13 z " id="path5"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/Contents.json
index d1ddf8d1c..1b3a353bb 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"hairdresser@1x.png","idiom":"universal","scale":"1x"},{"filename":"hairdresser@2x.png","idiom":"universal","scale":"2x"},{"filename":"hairdresser@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"hairdresser.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser.svg
new file mode 100644
index 000000000..82f598125
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="hairdresser" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M15,3c0,0-2-0.6-3.5,0.5l-4.3,3C6.4,5.9,5.2,5.2,4,4.8V4c0-1.1-0.9-2-2-2C0.9,2,0,2.9,0,4v1.5&#xA;&#x9;C0,6,0.5,6,0.5,6H2h0.5C4.5,6,6,7.5,6,7.5S4.5,9,2.5,9H2H0.5C0.5,9,0,9,0,9.5V11c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2v-0.8&#xA;&#x9;c1.2-0.4,2.4-1.1,3.2-1.7l4.3,3C13,12.6,15,12,15,12L8.5,7.5L15,3z M3,5H2H1V4c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1V5z M3,11&#xA;&#x9;c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1v-1h1h1V11z M7.25,8c-0.2761,0-0.5-0.2239-0.5-0.5S6.9739,7,7.25,7s0.5,0.2239,0.5,0.5&#xA;&#x9;S7.5261,8,7.25,8z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@1x.png
deleted file mode 100644
index 090b21819..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@2x.png
deleted file mode 100644
index d5935bb2b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@3x.png
deleted file mode 100644
index e874bd909..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hairdresser.imageset/hairdresser@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/Contents.json
index f1fe41ac4..7200db638 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"harbor@1x.png","idiom":"universal","scale":"1x"},{"filename":"harbor@2x.png","idiom":"universal","scale":"2x"},{"filename":"harbor@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"harbor.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor.svg
new file mode 100644
index 000000000..b057f6785
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="harbor" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path5263" d="M7.5,0C5.5,0,4,1.567,4,3.5c0.0024,1.5629,1.0397,2.902,2.5,3.3379v6.0391&#xA;&#x9;c-0.9305-0.1647-1.8755-0.5496-2.6484-1.2695C2.7992,10.6273,2.002,9.0676,2.002,6.498c0.0077-0.5646-0.4531-1.0236-1.0176-1.0137&#xA;&#x9;C0.4329,5.493-0.0076,5.9465,0,6.498c0,3.0029,1.0119,5.1955,2.4902,6.5723C3.9685,14.4471,5.8379,15,7.5,15&#xA;&#x9;c1.6656,0,3.535-0.5596,5.0117-1.9395S14.998,9.4868,14.998,6.498c0.0648-1.3953-2.0628-1.3953-1.998,0&#xA;&#x9;c0,2.553-0.7997,4.1149-1.8535,5.0996C10.3731,12.3203,9.4288,12.7084,8.5,12.875V6.8418C9.9607,6.4058,10.9986,5.0642,11,3.5&#xA;&#x9;C11,1.567,9.5,0,7.5,0z M7.5,2C8.3284,2,9,2.6716,9,3.5S8.3284,5,7.5,5S6,4.3284,6,3.5S6.6716,2,7.5,2z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@1x.png
deleted file mode 100644
index f5b9558d6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@2x.png
deleted file mode 100644
index ab569b89b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@3x.png
deleted file mode 100644
index 09c6dc327..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/harbor.imageset/harbor@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/Contents.json
index f38ca4244..337cd8fa8 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"hardware@1x.png","idiom":"universal","scale":"1x"},{"filename":"hardware@2x.png","idiom":"universal","scale":"2x"},{"filename":"hardware@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"hardware.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware.svg
new file mode 100644
index 000000000..a42601d68
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="hardware" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13.7919,3.2619c0,0-1.676,1.675-2.1163,2.1208c-0.085,0.0861-0.1688,0.1135-0.282,0.0961&#xA;&#x9;c-0.1481-0.0226-0.2974-0.038-0.4462-0.0558c-0.4072-0.0485-0.8145-0.0966-1.2292-0.1458C9.649,4.6852,9.5787,4.1049,9.5177,3.5236&#xA;&#x9;C9.512,3.4689,9.5509,3.3943,9.5925,3.3522c0.5071-0.5134,1.9261-1.9287,2.134-2.136c-0.4508-0.2129-1.2243-0.2968-1.8007-0.2031&#xA;&#x9;c-2.1801,0.3543-3.5112,2.534-2.8206,4.625C7.1432,5.753,7.1194,5.8201,7.0374,5.902C5.1891,7.7454,3.3436,9.5914,1.498,11.4374&#xA;&#x9;c-0.0616,0.0616-0.1231,0.124-0.1779,0.1913c-0.5264,0.6473-0.3873,1.6264,0.2974,2.102c0.6044,0.4197,1.3658,0.3442,1.9053-0.1948&#xA;&#x9;c1.8534-1.8519,3.7059-3.7047,5.556-5.5598C9.1707,7.884,9.2437,7.8526,9.3779,7.8983c0.6189,0.2109,1.2524,0.2354,1.8884,0.0884&#xA;&#x9;c1.9386-0.4478,3.1251-2.3732,2.6549-4.3034C13.8895,3.5532,13.843,3.4244,13.7919,3.2619z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@1x.png
deleted file mode 100644
index 9b620be42..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@2x.png
deleted file mode 100644
index f3561cb22..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@3x.png
deleted file mode 100644
index aa8a8b438..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hardware.imageset/hardware@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/Contents.json
index 5ce544939..213ef40cc 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"heart@1x.png","idiom":"universal","scale":"1x"},{"filename":"heart@2x.png","idiom":"universal","scale":"2x"},{"filename":"heart@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"heart.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart.svg
new file mode 100644
index 000000000..12280464b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="heart">
+  <path d="m13.91 7.75001c-1.17 2.24999-4.30002 5.30999-6.07002 6.93999-.1903.1718-.4797.1718-.67 0-1.78-1.63-4.91-4.69-6.08-6.93999-2.57-4.95 3.91-8.250002 6.41-3.3 2.5-4.950002 8.98002-1.65 6.41002 3.3z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@1x.png
deleted file mode 100644
index 6d3d3eeb2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@2x.png
deleted file mode 100644
index 39b86627c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@3x.png
deleted file mode 100644
index 2f29577e7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/heart.imageset/heart@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/Contents.json
index d11321b10..3bbbf0c22 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"heliport@1x.png","idiom":"universal","scale":"1x"},{"filename":"heliport@2x.png","idiom":"universal","scale":"2x"},{"filename":"heliport@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"heliport.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport.svg
new file mode 100644
index 000000000..389332249
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="heliport" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path10415" d="M4,2C3,2,3,3,4,3h4v1C7.723,4,7.5,4.223,7.5,4.5V5H5H3.9707H3.9316&#xA;&#x9;C3.7041,4.1201,2.9122,3.5011,2,3.5c-1.1046,0-2,0.8954-2,2s0.8954,2,2,2c0.3722-0.001,0.7368-0.1058,1.0527-0.3027L5.5,10.5&#xA;&#x9;C6.5074,11.9505,8.3182,12,9,12h5c0,0,1,0,1-1v-0.9941C15,9.2734,14.874,8.874,14.5,8.5l-3-3c0,0-0.5916-0.5-1.2734-0.5H9.5V4.5&#xA;&#x9;C9.5,4.223,9.277,4,9,4V3h4c1,0,1-1,0-1C13,2,4,2,4,2z M2,4.5c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1s-1-0.4477-1-1&#xA;&#x9;C1,4.9477,1.4477,4.5,2,4.5z M10,6c0.5,0,0.7896,0.3231,1,0.5L13.5,9H10c0,0-1,0-1-1V7C9,7,9,6,10,6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@1x.png
deleted file mode 100644
index 9ee6c65cb..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@2x.png
deleted file mode 100644
index 1ead14f24..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@3x.png
deleted file mode 100644
index 5ee12dd77..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/heliport.imageset/heliport@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/Contents.json
index 0cb493d0b..e62d354c2 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"highway-rest-area@1x.png","idiom":"universal","scale":"1x"},{"filename":"highway-rest-area@2x.png","idiom":"universal","scale":"2x"},{"filename":"highway-rest-area@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"highway-rest-area.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area.svg
new file mode 100644
index 000000000..c0a6227de
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="highway-rest-area">
+  <path d="M13.5,13h-3V9h3a.5.5,0,0,0,.4092-.7871L11.66,5h.84a.5.5,0,0,0,.3838-.82l-2.5-3a.5155.5155,0,0,0-.7676,0l-2.5,3A.5.5,0,0,0,7.5,5h.84L6.0908,8.2129A.5.5,0,0,0,6.5,9h3v4H4V11H5.5a.5.5,0,0,0,0-1h-4a.5.5,0,0,0,0,1H3v2H1.5a.5.5,0,0,0,0,1h12a.5.5,0,0,0,0-1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@1x.png
deleted file mode 100644
index 0f86e6864..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@2x.png
deleted file mode 100644
index 7a8f46251..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@3x.png
deleted file mode 100644
index 0f4d676c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/highway-rest-area.imageset/highway-rest-area@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/historic.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/historic.imageset/Contents.json
new file mode 100644
index 000000000..e96d3462f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/historic.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"historic.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/historic.imageset/historic.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/historic.imageset/historic.svg
new file mode 100644
index 000000000..1d246d522
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/historic.imageset/historic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="historic" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="m7.5 1c-1 0-1 1-2 1h-3.5c-.54467 0-1 .45533-1 1v7c0 .5447.45533 1 1 1h5v2.5s0 .5.5.5.5-.5.5-.5v-2.5h5c.5447 0 1-.4553 1-1v-7c0-.54467-.4553-1-1-1h-3.5c-1 0-1-1-2-1zm-4.5 4v-1h9v1zm0 1h4v1h-4zm0 2h7v1h-7z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/home.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/home.imageset/Contents.json
new file mode 100644
index 000000000..7642b5467
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/home.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"home.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/home.imageset/home.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/home.imageset/home.svg
new file mode 100644
index 000000000..5a85cd4f9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/home.imageset/home.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="home">
+  <path d="M2,13.7478c0,0.13807,0.11193,0.25,0.25,0.25h3.749v-3h3v3h3.749c0.13807,0,0.25-0.11193,0.25-0.25V7.9987H2&#xA;&#x9;C2,7.9987,2,13.7478,2,13.7478z M13.93,6.5778l-0.9319-0.8189V2c0-0.55228-0.44771-1-1-1s-1,0.44772-1,1v2L7.6808,1.09&#xA;&#x9;C7.5863,0.9897,7.42846,0.98478,7.3279,1.079L7.3169,1.09L1.0678,6.553C0.9734,6.65376,0.97856,6.81197,1.07932,6.90637&#xA;&#x9;C1.12478,6.94896,1.18451,6.97304,1.2468,6.9739L3,6.9989h10.7468c0.13807,0.00046,0.25037-0.1111,0.25083-0.24917&#xA;&#x9;C13.99784,6.68592,13.97365,6.62445,13.93,6.5779V6.5778z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/Contents.json
index 0e1fa49bf..1551391e8 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"horse-riding@1x.png","idiom":"universal","scale":"1x"},{"filename":"horse-riding@2x.png","idiom":"universal","scale":"2x"},{"filename":"horse-riding@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"horse-riding.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding.svg
new file mode 100644
index 000000000..607a6917d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="horse-riding" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6,1A1,1,0,1,1,7,2,1,1,0,0,1,6,1ZM8,3.5a.484.484,0,0,0,0-.058A.472.472,0,0,0,7.5,3h-1a.484.484,0,0,0-.058,0A.472.472,0,0,0,6,3.5V7H8Zm6.85,3.644L12.8,4.8l.085-.509a.478.478,0,0,0,.008-.063.25.25,0,0,0-.25-.25.346.346,0,0,0-.158.056L9,7H8L9,8V9.5a.5.5,0,0,1-1,0v-1L6,7H4a1.5,1.5,0,0,0-1.243.661A1.466,1.466,0,0,0,1.563,7H1.5A1.449,1.449,0,0,0,0,8.4v.086A3.781,3.781,0,0,0,.559,10.4a.278.278,0,0,0,.191.1A.25.25,0,0,0,1,10.25V9s-.02-.924.753-1c.5-.048.747.253.747.5V11L2,13v1.75a.25.25,0,0,0,.25.25.254.254,0,0,0,.25-.234V13L4,11v1l.5,2.8a.255.255,0,0,0,.246.2A.25.25,0,0,0,5,14.754H5L4.855,12.3,5.5,11H8v1l.508,2.813A.257.257,0,0,0,8.75,15,.25.25,0,0,0,9,14.75V12l.367-1a1.155,1.155,0,0,0,.543-.6l2.161-3.767a.863.863,0,0,0,1.023.4l1.066.818a.591.591,0,0,0,.35.135.487.487,0,0,0,.475-.4A.552.552,0,0,0,14.85,7.144Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@1x.png
deleted file mode 100644
index c5cfa9450..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@2x.png
deleted file mode 100644
index 64cabb3f0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@3x.png
deleted file mode 100644
index 652765b67..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/horse-riding.imageset/horse-riding@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/Contents.json
index 4246dee27..fc3797a41 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"hospital-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"hospital-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"hospital-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"hospital-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP.svg
new file mode 100644
index 000000000..0afb5a769
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="hospital-JP">
+  <path d="m12.5038 3h-10.00777c-.26639.00235-.52096.11039-.70772.30036-.18677.18998-.29046.44634-.28828.71274v5.5807c-.00063.18713.05047.37079.14765.5307.09718.1599.23667.2899.40305.3755l4.78 2.8394c.20725.1056.43653.1606.6691.1606.23258 0 .46186-.055.6691-.1606l4.78037-2.8394c.1664-.0856.3059-.2155.4031-.3755.0972-.15989.1483-.34357.1476-.5307v-5.5807c.0012-.13194-.0237-.2628-.0732-.38512-.0494-.12232-.1225-.2337-.215-.32777-.0925-.09408-.2027-.16901-.3241-.22052-.1215-.05151-.2519-.07859-.3839-.07969zm-2.0038 5.5h-1.99997v2h-2v-2h-2v-2h2v-2h2v2h1.99997z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@1x.png
deleted file mode 100644
index 7ecdd89d3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@2x.png
deleted file mode 100644
index fb0870d4c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@3x.png
deleted file mode 100644
index 80c66e04b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital-JP.imageset/hospital-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital.imageset/Contents.json
new file mode 100644
index 000000000..fb488d680
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"hospital.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital.imageset/hospital.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital.imageset/hospital.svg
new file mode 100644
index 000000000..ae7cae000
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hospital.imageset/hospital.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="hospital" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect4194" d="M7,1C6.4,1,6,1.4,6,2v4H2C1.4,6,1,6.4,1,7v1&#xA;&#x9;c0,0.6,0.4,1,1,1h4v4c0,0.6,0.4,1,1,1h1c0.6,0,1-0.4,1-1V9h4c0.6,0,1-0.4,1-1V7c0-0.6-0.4-1-1-1H9V2c0-0.6-0.4-1-1-1H7z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/Contents.json
index edaddb41a..71528446c 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"hot-spring@1x.png","idiom":"universal","scale":"1x"},{"filename":"hot-spring@2x.png","idiom":"universal","scale":"2x"},{"filename":"hot-spring@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"hot-spring.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring.svg
new file mode 100644
index 000000000..ee061d1a8
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="hot-spring" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6.682,5.759c-.505-.725-.781-1.121-.63-2.376,.139-1.156,.678-1.616,1.198-2.059,.404-.345,.797-.68,.981-1.324,.301,.722-.036,1.47-.349,2.164-.311,.691-.599,1.329-.211,1.836,.971,1.271,1.963,2.88,.971,4.586-.214,.393-.539,.681-.861,.968-.422,.375-.841,.747-1.004,1.348-.269-.677,.008-1.366,.285-2.052,.306-.759,.61-1.516,.172-2.251-.203-.34-.389-.607-.551-.84Zm3.371-1.174c-.098-.632,.034-1.281,.368-1.809,.367-.45,.701-.642,.991-.81,.345-.199,.627-.362,.83-.877,.289,.684,0,1.188-.304,1.718-.119,.207-.24,.418-.329,.645-.191,.61,.101,.893,.467,1.247,.358,.346,.786,.76,.899,1.617,.083,.635-.036,1.156-.372,1.684-.356,.436-.681,.655-.965,.846-.356,.24-.648,.437-.856,.965-.292-.688,.031-1.259,.353-1.828,.123-.217,.246-.434,.334-.658,.073-.558-.234-.867-.581-1.217-.357-.36-.757-.763-.834-1.523Zm-8.018,0c-.098-.632,.005-1.3,.368-1.809,.376-.528,.729-.717,1.035-.881,.323-.173,.594-.318,.786-.806,.289,.683-.014,1.208-.325,1.749-.122,.212-.246,.427-.336,.655-.152,.385,.131,1.014,.501,1.242,1.002,.801,1.227,2.286,.547,3.353-.366,.448-.704,.648-.999,.823-.353,.209-.645,.382-.849,.898-.278-.656,.008-1.18,.3-1.714,.131-.24,.263-.481,.345-.737,.179-.557-.134-.884-.51-1.277-.349-.365-.752-.785-.863-1.498Zm10.965,4.414c.7,2.616-3.474,3-5.5,3s-6.2-.484-5.5-3c-.633,.316-1,.961-1,1.5,0,1.519,2.91,2.9,6.5,2.9s6.5-1.381,6.5-2.9c0-.539-.367-1.184-1-1.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@1x.png
deleted file mode 100644
index 252c8d8c6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@2x.png
deleted file mode 100644
index 4a629a66d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@3x.png
deleted file mode 100644
index 71b1356a0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/hot-spring.imageset/hot-spring@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/Contents.json
index 234379ea7..7911f64a3 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"ice-cream@1x.png","idiom":"universal","scale":"1x"},{"filename":"ice-cream@2x.png","idiom":"universal","scale":"2x"},{"filename":"ice-cream@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"ice-cream.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream.svg
new file mode 100644
index 000000000..d37bc11f4
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="ice-cream">
+  <path d="M5.44,8.17a3.473,3.473,0,0,0,2-.63A3.5,3.5,0,0,0,9,8.14h.44L8,13.7a.5.5,0,0,1-.92,0Zm6-3.473a2,2,0,0,1-4,0h0a2,2,0,1,1-2-2h.12a2,2,0,1,1,3.75,0h.13A2,2,0,0,1,11.439,4.7Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@1x.png
deleted file mode 100644
index 84c0248f4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@2x.png
deleted file mode 100644
index 65d123c25..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@3x.png
deleted file mode 100644
index 1d3128856..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ice-cream.imageset/ice-cream@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/Contents.json
index 7ae58341d..14266835e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"industry@1x.png","idiom":"universal","scale":"1x"},{"filename":"industry@2x.png","idiom":"universal","scale":"2x"},{"filename":"industry@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"industry.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry.svg
new file mode 100644
index 000000000..c2c8d830d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="industry" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M14,1v12H1V8.72c0.0016-0.1419,0.0634-0.2764,0.17-0.37l3-3.22c0.2074-0.1823,0.5234-0.1618,0.7056,0.0456&#xA;&#x9;C4.9568,5.268,5.0011,5.387,5,5.51v3l3.16-3.37c0.2025-0.1878,0.5188-0.1759,0.7066,0.0266C8.9532,5.2599,9.0009,5.3827,9,5.51V11h3&#xA;&#x9;V1H14z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@1x.png
deleted file mode 100644
index 4b5190dcc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@2x.png
deleted file mode 100644
index 00d3c2362..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@3x.png
deleted file mode 100644
index 7b01041f9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/industry.imageset/industry@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/Contents.json
index 721af7730..cb627d021 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"information@1x.png","idiom":"universal","scale":"1x"},{"filename":"information@2x.png","idiom":"universal","scale":"2x"},{"filename":"information@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"information.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information.svg
new file mode 100644
index 000000000..487bc92be
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="information" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect8399" d="M7.5,1&#xA;&#x9;C6.7,1,6,1.7,6,2.5S6.7,4,7.5,4S9,3.3,9,2.5S8.3,1,7.5,1z M4,5v1c0,0,2,0,2,2v2c0,2-2,2-2,2v1h7v-1c0,0-2,0-2-2V6c0-0.5-0.5-1-1-1H4&#xA;&#x9;z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@1x.png
deleted file mode 100644
index 2a72fe46b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@2x.png
deleted file mode 100644
index a62797411..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@3x.png
deleted file mode 100644
index 15de50f6c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/information.imageset/information@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/Contents.json
index e0c8d2f14..9509d9ba5 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"jewelry-store@1x.png","idiom":"universal","scale":"1x"},{"filename":"jewelry-store@2x.png","idiom":"universal","scale":"2x"},{"filename":"jewelry-store@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"jewelry-store.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store.svg
new file mode 100644
index 000000000..f43c0bcd0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="jewelry-store" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12,8.5c0,2.4853-2.0147,4.5-4.5,4.5S3,10.9853,3,8.5c0-1.8483,1.1164-3.4329,2.7099-4.1255l0.1761,0.137l0.7739,0.6019&#xA;&#x9;C5.1366,5.4922,4,6.8611,4,8.5C4,10.4299,5.5701,12,7.5,12S11,10.4299,11,8.5c0-1.6389-1.1366-3.0078-2.6599-3.3866l0.95-0.7388&#xA;&#x9;C10.8836,5.0672,12,6.6517,12,8.5z M7.5,4.5L10,2.5555L9,1H6L5,2.5555l1.5,1.1667L7.5,4.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@1x.png
deleted file mode 100644
index 38ca952bf..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@2x.png
deleted file mode 100644
index 03ade4fd2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@3x.png
deleted file mode 100644
index a1f4509e1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/jewelry-store.imageset/jewelry-store@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/Contents.json
index f9504d812..8453dbe74 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"karaoke@1x.png","idiom":"universal","scale":"1x"},{"filename":"karaoke@2x.png","idiom":"universal","scale":"2x"},{"filename":"karaoke@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"karaoke.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke.svg
new file mode 100644
index 000000000..74f44fd9b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="karaoke">
+  <path d="M12.1,2.952A2.988,2.988,0,0,0,6.99,4.917l3.142,3.142A2.988,2.988,0,0,0,12.1,2.952Zm-7.428,5.3L2.55,10.377a1,1,0,0,0,0,1.414l.707.707a1,1,0,0,0,1.414,0l2.121-2.121L8.914,8.255,6.793,6.134Zm.741,2.087-.707-.707L6.793,7.548l.707.707Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@1x.png
deleted file mode 100644
index 3d2d679ff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@2x.png
deleted file mode 100644
index 14d21464e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@3x.png
deleted file mode 100644
index e9ef3891a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/karaoke.imageset/karaoke@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/Contents.json
index 37faa041f..3558868ff 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"landmark-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"landmark-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"landmark-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"landmark-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP.svg
new file mode 100644
index 000000000..6a997f2cf
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="landmark-JP">
+  <path d="m9.5 4c0 .39556-.1173.78224-.33706 1.11114s-.53212.58524-.89757.73662c-.36545.15137-.76759.19098-1.15555.11381s-.74433-.26765-1.02403-.54736c-.27971-.2797-.47019-.63607-.54736-1.02403s-.03756-.79009.11381-1.15555c.15138-.36545.40772-.67781.73662-.89757s.71558-.33706 1.11114-.33706c.53043 0 1.03914.21071 1.41421.58579.37508.37507.58579.88378.58579 1.41421zm-6 4c-.39556 0-.78224.1173-1.11114.33706s-.58524.53212-.73662.89757c-.15137.36546-.19098.76757-.11381 1.15557.07717.3879.26765.7443.54736 1.024.2797.2797.63607.4702 1.02403.5474.38796.0771.7901.0375 1.15555-.1138.36545-.1514.67781-.4078.89757-.7367s.33706-.7155.33706-1.1111c0-.53043-.21071-1.03914-.58579-1.41421-.37507-.37508-.88378-.58579-1.41421-.58579zm8 0c-.3956 0-.7822.1173-1.1111.33706s-.58528.53212-.73666.89757c-.15137.36546-.19098.76757-.11381 1.15557.07717.3879.26765.7443.54737 1.024.2797.2797.6361.4702 1.024.5474.388.0771.7901.0375 1.1556-.1138.3654-.1514.6778-.4078.8975-.7367.2198-.3289.3371-.7155.3371-1.1111 0-.53043-.2107-1.03914-.5858-1.41421-.3751-.37508-.8838-.58579-1.4142-.58579z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@1x.png
deleted file mode 100644
index b8afcf807..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@2x.png
deleted file mode 100644
index d5125c0e0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@3x.png
deleted file mode 100644
index 1ba1e5f86..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark-JP.imageset/landmark-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/Contents.json
index 7709cdfc1..4479dd9c9 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"landmark@1x.png","idiom":"universal","scale":"1x"},{"filename":"landmark@2x.png","idiom":"universal","scale":"2x"},{"filename":"landmark@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"landmark.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark.svg
new file mode 100644
index 000000000..2c86ce5f8
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="landmark" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.5,12H12v-0.5c0-0.3-0.2-0.5-0.5-0.5H11V6h1l1-2c-1,0.1-2,0.1-3,0C9.2,3.4,8.6,2.8,8,2V1.5C8,1.2,7.8,1,7.5,1&#xA;&#x9;S7,1.2,7,1.5V2C6.4,2.8,5.8,3.4,5,4C4,4.1,3,4.1,2,4l1,2h1v5c0,0-0.5,0-0.5,0C3.2,11,3,11.2,3,11.5V12H2.5C2.2,12,2,12.2,2,12.5V13&#xA;&#x9;h11v-0.5C13,12.2,12.8,12,12.5,12z M7,11H5V6h2V11z M10,11H8V6h2V11z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@1x.png
deleted file mode 100644
index 4e3d24026..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@2x.png
deleted file mode 100644
index 52b196c0d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@3x.png
deleted file mode 100644
index 56d64359e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landmark.imageset/landmark@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/Contents.json
index c1fdca806..774432c35 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"landuse@1x.png","idiom":"universal","scale":"1x"},{"filename":"landuse@2x.png","idiom":"universal","scale":"2x"},{"filename":"landuse@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"landuse.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse.svg
new file mode 100644
index 000000000..cf27a80c3
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="landuse">
+  <path d="m8.911 2.85401c.02782.02324.05021.0523.06558.08512.01538.03283.02337.06863.02342.10488v3.706c0 .0663-.02634.12989-.07322.17678-.04689.04688-.11048.07322-.17678.07322h-2.5c-.0663 0-.12989-.02634-.17678-.07322-.04688-.04689-.07322-.11048-.07322-.17678v-1.75h-1v1.75c0 .0663-.02634.12989-.07322.17678-.04689.04688-.11048.07322-.17678.07322h-2.5c-.0663 0-.12989-.02634-.17678-.07322-.04688-.04689-.07322-.11048-.07322-.17678v-3.7c.00005-.03625.00804-.07205.02342-.10488.01537-.03282.03776-.06188.06558-.08512l3.254-2.728c.04413-.0370337.09989-.0573335.1575-.0573335s.11337.0202998.1575.0573335zm-1.159 5.646c-.04915.00002-.09718.01464-.138.042l-2.614 1.95799h-1v-1.99999c0-.13261-.05268-.25979-.14645-.35355-.09376-.09377-.22094-.14645-.35355-.14645s-.25979.05268-.35355.14645c-.09377.09376-.14645.22094-.14645.35355v1.99999h-1v-1.99999c0-.13261-.05268-.25979-.14645-.35355-.09376-.09377-.22094-.14645-.35355-.14645s-.25979.05268-.35355.14645c-.09377.09376-.14645.22094-.14645.35355v4.24999c0 .0663.02634.1299.07322.1768.04689.0469.11048.0732.17678.0732h6.5c.0663 0 .12989-.0263.17678-.0732.04688-.0469.07322-.1105.07322-.1768v-3.99999c.00026-.03274-.00596-.0652-.0183-.09552-.01235-.03032-.03057-.0579-.05363-.08114-.02305-.02324-.05048-.04168-.0807-.05427s-.06263-.01907-.09537-.01907zm6.248-3.255v6.49999c0 .0671-.0267.1315-.0741.1789-.0474.0475-.1118.0741-.1789.0741h-3.494c-.0668 0-.1308-.0264-.1782-.0734s-.0743-.1108-.0748-.1776v-6.49699c-.00013-.03287.0062-.06544.0188-.09583.0125-.03039.0309-.058.0541-.08124.0233-.02324.0509-.04165.0813-.05417s.0629-.01889.0958-.01876h.75v-.751c0-.06604.0262-.12937.0729-.17607s.1101-.07293.1761-.07293h1.5c.0668.00053.1306.02742.1776.07481.047.04738.0734.11144.0734.17819v.747h.755c.065 0 .1273.02581.1732.07176.046.04595.0718.10826.0718.17324zm-1 4.75499h-2v1h2zm0-1.99999h-2v1h2zm0-2h-2v1h2z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@1x.png
deleted file mode 100644
index f6e220ada..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@2x.png
deleted file mode 100644
index 799ce310c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@3x.png
deleted file mode 100644
index b40af8f8e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/landuse.imageset/landuse@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/Contents.json
index 9da5defbf..77253f018 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"laundry@1x.png","idiom":"universal","scale":"1x"},{"filename":"laundry@2x.png","idiom":"universal","scale":"2x"},{"filename":"laundry@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"laundry.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry.svg
new file mode 100644
index 000000000..206e89008
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="laundry" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path3291-2" d="M8,1L6,3H3c0,0-1,0-1,1v9c0,1,1,1,1,1h9c0,0,1,0,1-1V2c0-1-1-1-1-1&#xA;&#x9;S8,1,8,1z M8.5,2h2C10.777,2,11,2.223,11,2.5S10.777,3,10.5,3h-2C8.223,3,8,2.777,8,2.5S8.223,2,8.5,2z M7.5,6&#xA;&#x9;c1.6569,0,3,1.3431,3,3s-1.3431,3-3,3s-3-1.3431-3-3S5.8431,6,7.5,6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@1x.png
deleted file mode 100644
index 25e12634b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@2x.png
deleted file mode 100644
index 0c3a9622d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@3x.png
deleted file mode 100644
index 88d996cff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/laundry.imageset/laundry@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/Contents.json
index f2e834a78..1e721f3d1 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"library@1x.png","idiom":"universal","scale":"1x"},{"filename":"library@2x.png","idiom":"universal","scale":"2x"},{"filename":"library@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"library.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library.svg
new file mode 100644
index 000000000..18d529a12
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="library" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M1.0819,9.9388C0.9871,9.867,1.0007,9.7479,1.0007,9.7479L1.5259,3.5c0,0,0.0082-0.0688,0.0388-0.104&#xA;&#x9;C1.584,3.374,1.6084,3.342,1.6544,3.3232C2.1826,3.1072,5.0537,1.5519,6.5,3c0.2397,0.2777,0.4999,0.6876,0.4999,1v5.2879&#xA;&#x9;c0,0,0.0062,0.1122-0.0953,0.1801c-0.0239,0.016-0.124,0.0616-0.242,0.0026c-2.2253-1.1134-4.711,0.1546-5.3381,0.4871&#xA;&#x9;C1.1987,10.0244,1.1006,9.9531,1.0819,9.9388z M13.6754,9.9577c-0.6271-0.3325-3.1128-1.6005-5.3381-0.4871&#xA;&#x9;c-0.118,0.059-0.2181,0.0134-0.242-0.0026C7.9939,9.4001,8.0001,9.2879,8.0001,9.2879V4c0-0.3124,0.2602-0.7223,0.4999-1&#xA;&#x9;c1.4463-1.4481,4.2991,0.1071,4.8273,0.3232c0.046,0.0188,0.0704,0.0508,0.0897,0.0728C13.4476,3.4312,13.4558,3.5,13.4558,3.5&#xA;&#x9;l0.5435,6.2479c0,0,0.0136,0.1191-0.0812,0.1909C13.8994,9.9531,13.8013,10.0244,13.6754,9.9577z M8.8647,12.6863&#xA;&#x9;c0.0352-0.0085,0.0964-0.0443,0.1179-0.0775c0.0236-0.0364,0.0378-0.0617,0.0423-0.1088c0.0495-0.9379,1.6245-1.8119,4.6477-0.0298&#xA;&#x9;c0.0775,0.0441,0.1666,0.0396,0.2425-0.0155C14.0014,12.392,14,12.2859,14,12.2859v-0.5542c0,0,0.0003-0.0764-0.0272-0.1184&#xA;&#x9;c-0.0205-0.0312-0.0476-0.0643-0.0926-0.0858c-2.0254-1.3145-4.5858-1.8972-5.8854-0.1592&#xA;&#x9;c-0.0181,0.0423-0.0353,0.0613-0.0728,0.0905C7.8654,11.5028,7.7964,11.5,7.7964,11.5H7.2109c0,0-0.069,0.0028-0.1256-0.0412&#xA;&#x9;c-0.0375-0.0292-0.0547-0.0482-0.0728-0.0905c-1.2996-1.738-3.86-1.1828-5.8854,0.1317c-0.045,0.0215-0.0721,0.0546-0.0926,0.0858&#xA;&#x9;c-0.0275,0.042-0.0272,0.1184-0.0272,0.1184v0.5542c0,0-0.0014,0.1061,0.0849,0.1688c0.0759,0.0551,0.165,0.0596,0.2425,0.0155&#xA;&#x9;c3.0232-1.7821,4.5982-0.8806,4.6477,0.0573c0.0045,0.0471,0.0187,0.0724,0.0423,0.1088c0.0215,0.0332,0.0827,0.069,0.1179,0.0775&#xA;&#x9;C6.8645,12.8656,7.9112,12.9363,8.8647,12.6863z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@1x.png
deleted file mode 100644
index fbc15c091..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@2x.png
deleted file mode 100644
index 9741ceac6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@3x.png
deleted file mode 100644
index 44b021445..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/library.imageset/library@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lift-gate.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/lift-gate.imageset/Contents.json
new file mode 100644
index 000000000..19b3f7ed9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lift-gate.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"lift-gate.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lift-gate.imageset/lift-gate.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/lift-gate.imageset/lift-gate.svg
new file mode 100644
index 000000000..c217aef1f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lift-gate.imageset/lift-gate.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="lift-gate">
+  <path d="M1 4a2 2 0 1 1 4 0v8a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V4Zm3 0a1 1 0 1 0-2 0 1 1 0 0 0 2 0Zm4.5 2L7 3H6v3h2.5ZM10 6h1.5L10 3H8.5L10 6Zm3.25 0H13l-1.5-3h1.75a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-.75.75Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/Contents.json
index 07a7d75b1..ddc09ca51 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"lighthouse-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"lighthouse-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"lighthouse-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"lighthouse-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP.svg
new file mode 100644
index 000000000..277fbcd07
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="lighthouse-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M9.5,7.4c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2C8.6,5.4,9.5,6.3,9.5,7.4z M14,7.5C14,7.8,13.8,8,13.5,8h-1.6&#xA;&#x9;c-0.1,0.9-0.311,1.582-0.911,2.282l1.064,1.064c0.2,0.2,0.196,0.504-0.004,0.704c-0.209,0.209-0.5,0.207-0.704,0.004L10.3,11&#xA;&#x9;c-0.6,0.5-1.4,0.8-2.3,0.9v1.6C8,13.8,7.8,14,7.5,14S7,13.8,7,13.5v-1.6c-0.9-0.1-1.7-0.4-2.3-0.9l-1.1,1.1&#xA;&#x9;c-0.207,0.207-0.48,0.213-0.696-0.004c-0.2-0.2-0.207-0.5-0.007-0.7L4,10.3C3.5,9.7,3.1,8.9,3,8H1.5C1.2,8,1,7.8,1,7.5S1.2,7,1.5,7&#xA;&#x9;H3c0.1-0.9,0.4-1.7,1-2.4l-1-1C2.8,3.4,2.8,3.1,3,2.9s0.5-0.2,0.7,0l1,1l0,0C5.3,3.4,6.1,3.1,7,3V1.5C7,1.2,7.2,1,7.5,1S8,1.2,8,1.5&#xA;&#x9;V3c0.9,0.1,1.7,0.5,2.3,1l0,0l1.1-1.1c0.2-0.2,0.5-0.2,0.7,0s0.2,0.5,0,0.7L11,4.7l0,0c0.5,0.7,0.8,1.4,0.9,2.3h1.6&#xA;&#x9;C13.8,7,14,7.2,14,7.5z M11.1,7.4c0-2-1.6-3.6-3.6-3.6S3.8,5.5,3.8,7.4S5.4,11,7.4,11S11.1,9.4,11.1,7.4z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@1x.png
deleted file mode 100644
index 3dc2a78f4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@2x.png
deleted file mode 100644
index 6d7d468f6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@3x.png
deleted file mode 100644
index fe0d36f18..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse-JP.imageset/lighthouse-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/Contents.json
index 2feb15a70..4eb55fb66 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"lighthouse@1x.png","idiom":"universal","scale":"1x"},{"filename":"lighthouse@2x.png","idiom":"universal","scale":"2x"},{"filename":"lighthouse@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"lighthouse.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse.svg
new file mode 100644
index 000000000..e3b9a241e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="lighthouse" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M4.5,6L0,7V6.5l4.5-1V6z M4.5,3.5L0,2.5V3l4.5,1V3.5z M10.5,3.5V4L15,3V2.5L10.5,3.5z M10.5,6L15,7V6.5l-4.5-1V6z M8,7V2&#xA;&#x9;h2.5c0.2761,0.0552,0.5448-0.1239,0.6-0.4c0.0552-0.2761-0.1239-0.5448-0.4-0.6l-3-1C7.5696-0.0586,7.4204-0.0586,7.29,0l-3,1&#xA;&#x9;c-0.2761,0.0552-0.4552,0.3239-0.4,0.6S4.2139,2.0552,4.49,2H7v5H5l-2,7h9l-2-7H8z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@1x.png
deleted file mode 100644
index 73db319a7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@2x.png
deleted file mode 100644
index 909d02e5c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@3x.png
deleted file mode 100644
index e8b4a4013..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lighthouse.imageset/lighthouse@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/Contents.json
index d4082e4ec..af0ece264 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"lodging@1x.png","idiom":"universal","scale":"1x"},{"filename":"lodging@2x.png","idiom":"universal","scale":"2x"},{"filename":"lodging@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"lodging.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging.svg
new file mode 100644
index 000000000..d1bde6b04
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="lodging" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect6507" d="M0.5,2.5C0.2,2.5,0,2.7,0,3v7.5v2C0,12.8,0.2,13,0.5,13S1,12.8,1,12.5V11h13v1.5&#xA;&#x9;c0,0.3,0.2,0.5,0.5,0.5s0.5-0.2,0.5-0.5v-2c0-0.3-0.2-0.5-0.5-0.5H1V3C1,2.7,0.8,2.5,0.5,2.5z M3.5,3C2.7,3,2,3.7,2,4.5l0,0&#xA;&#x9;C2,5.3,2.7,6,3.5,6l0,0C4.3,6,5,5.3,5,4.5l0,0C5,3.7,4.3,3,3.5,3L3.5,3z M7,4C5.5,4,5.5,5.5,5.5,5.5V7h-3C2.2,7,2,7.2,2,7.5v1&#xA;&#x9;C2,8.8,2.2,9,2.5,9H6h9V6.5C15,4,12.5,4,12.5,4H7z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@1x.png
deleted file mode 100644
index e38084d3c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@2x.png
deleted file mode 100644
index 093b21ee7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@3x.png
deleted file mode 100644
index db79f2ec1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/lodging.imageset/lodging@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/Contents.json
index b4ef76c36..ccd940133 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"logging@1x.png","idiom":"universal","scale":"1x"},{"filename":"logging@2x.png","idiom":"universal","scale":"2x"},{"filename":"logging@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"logging.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging.svg
new file mode 100644
index 000000000..ffc515227
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="logging" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13.91,3.41,13.5,3l.2-.28c.02-.03.04-.05.06-.08A.969.969,0,0,0,14,1.99a1,1,0,0,0-1.62-.77c-.03.02-.06.05-.09.07L12,1.5l-.386-.386a.354.354,0,0,0-.525.475l.417.417-.5.5-.392-.392a.354.354,0,0,0-.525.475L10.5,3l-.5.5-.381-.381a.354.354,0,1,0-.528.472h0l.028.028L9.5,4,9,4.5l-.395-.395a.354.354,0,0,0-.517.483L8.5,5,8,5.5l-.365-.365a.354.354,0,0,0-.556.439h0C7.1,5.6,7.508,6,7.508,6L7,6.5l-.394-.392a.392.392,0,0,0-.5-.028.384.384,0,0,0-.028.5L6.1,6.6l.4.4L6,7.5l-.4-.4a.37.37,0,0,0-.5,0L6.248,8.244,12.09,2.41,12.5,2H13v.5l-.41.41L6.751,8.749,7.9,9.9a.355.355,0,0,0,0-.5l-.008-.009L7.5,9,8,8.5l.384.384a.354.354,0,0,0,.528-.472L8.5,8,9,7.5l.38.38a.354.354,0,0,0,.528-.472l-.02-.02L9.5,7l.5-.5.377.377A.35.35,0,0,0,10.64,7a.347.347,0,0,0,.252-.6L10.5,6l.5-.5.38.38a.354.354,0,0,0,.528-.472L11.88,5.38,11.5,5l.5-.5.381.381a.354.354,0,0,0,.528-.472l-.025-.025L12.5,4l.5-.5.382.382a.354.354,0,0,0,.528-.472ZM4.39,7.916C3.893,7.419,3.641,7,3,7H1.5a.5.5,0,0,0-.5.5v3A2.19,2.19,0,0,0,1.5,12l.815.811A2.251,2.251,0,0,0,5.493,13h0L7.5,11ZM3.5,10,2.262,11.238A1.3,1.3,0,0,1,2,10.5V8H3a.545.545,0,0,1,.335.194.455.455,0,0,1,.165.418Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@1x.png
deleted file mode 100644
index 736d398c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@2x.png
deleted file mode 100644
index 266c9c871..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@3x.png
deleted file mode 100644
index 14425b510..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/logging.imageset/logging@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/Contents.json
index 04b4e2b13..806a5cc30 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"marker-stroked@1x.png","idiom":"universal","scale":"1x"},{"filename":"marker-stroked@2x.png","idiom":"universal","scale":"2x"},{"filename":"marker-stroked@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"marker-stroked.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked.svg
new file mode 100644
index 000000000..2143cc8db
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="marker-stroked">
+  <path d="M5.11697 2.81756C5.76952 2.26561 6.65195 2 7.5 2C8.34805 2 9.23048 2.26561 9.88303 2.81756C10.5075 3.34579 11 4.20017 11 5.56759C11 5.94031 10.8461 6.52407 10.5105 7.29145C10.1859 8.03354 9.73523 8.85087 9.24257 9.65811C8.64175 10.6426 7.999 11.5793 7.48195 12.3097C6.96023 11.5798 6.31599 10.6233 5.71947 9.62296C5.2343 8.80934 4.79303 7.98717 4.47608 7.24844C4.14708 6.48162 4 5.91216 4 5.56759C4 4.20017 4.49248 3.34579 5.11697 2.81756ZM8.10767 13.1554C9.45904 11.2632 12 7.54181 12 5.56759C12 2.2883 9.57688 1 7.5 1C5.42312 1 3 2.2883 3 5.56759C3 7.44926 5.47533 11.2572 6.86751 13.1671C7.12165 13.5157 7.3397 13.8011 7.5 14C7.55627 13.9215 7.62241 13.8299 7.697 13.7266C7.81469 13.5636 7.95343 13.3714 8.10767 13.1554Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@1x.png
deleted file mode 100644
index 249a0e6ac..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@2x.png
deleted file mode 100644
index c13989662..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@3x.png
deleted file mode 100644
index e82a191de..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker-stroked.imageset/marker-stroked@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/Contents.json
index 9736580de..456a67f78 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"marker@1x.png","idiom":"universal","scale":"1x"},{"filename":"marker@2x.png","idiom":"universal","scale":"2x"},{"filename":"marker@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"marker.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker.svg
new file mode 100644
index 000000000..2247dcde7
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="marker">
+  <path d="M7.5 1C5.42312 1 3 2.2883 3 5.56759C3 7.79276 6.46156 12.7117 7.5 14C8.42309 12.7117 12 7.90993 12 5.56759C12 2.2883 9.57688 1 7.5 1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@1x.png
deleted file mode 100644
index 6699ea534..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@2x.png
deleted file mode 100644
index 67b988af9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@3x.png
deleted file mode 100644
index 19fde2963..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/marker.imageset/marker@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/Contents.json
index f1f68a968..461326842 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"mobile-phone@1x.png","idiom":"universal","scale":"1x"},{"filename":"mobile-phone@2x.png","idiom":"universal","scale":"2x"},{"filename":"mobile-phone@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"mobile-phone.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone.svg
new file mode 100644
index 000000000..b22778bd6
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="mobile-phone" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M10,2h0V1.5a.5.5,0,0,0-1,0V2H5A1,1,0,0,0,4,3V13a1,1,0,0,0,1,1h5a1,1,0,0,0,1-1V3A1,1,0,0,0,10,2ZM6,13H5V12H6Zm0-2H5V10H6ZM6,9H5V8H6Zm2,4H7V12H8Zm0-2H7V10H8ZM8,9H7V8H8Zm2,4H9V12h1Zm0-2H9V10h1Zm0-2H9V8h1Zm0-2.5a.5.5,0,0,1-.5.5h-4A.5.5,0,0,1,5,6.5v-3A.5.5,0,0,1,5.5,3h4a.5.5,0,0,1,.5.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@1x.png
deleted file mode 100644
index f64358ec6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@2x.png
deleted file mode 100644
index 6e1d179f9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@3x.png
deleted file mode 100644
index 7b3ab07e1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/mobile-phone.imageset/mobile-phone@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/Contents.json
index 3cf869053..e3b92b064 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"monument-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"monument-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"monument-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"monument-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP.svg
new file mode 100644
index 000000000..e5d731e59
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="monument-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12,13H4c-0.5,0-1-0.5-1-1V5c0-2,0.8-4,4-4c3.1,0,4,2,4,4v6h1c0.5,0,1,0.5,1,1S12.5,13,12,13z M5,11h4V5c0-1,0-2-2-2&#xA;&#x9;S5,4,5,5V11z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@1x.png
deleted file mode 100644
index 0d6bccfa0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@2x.png
deleted file mode 100644
index 919f3a50b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@3x.png
deleted file mode 100644
index b6a9f0def..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument-JP.imageset/monument-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/Contents.json
index 2c6422540..2a9467682 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"monument@1x.png","idiom":"universal","scale":"1x"},{"filename":"monument@2x.png","idiom":"universal","scale":"2x"},{"filename":"monument@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"monument.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument.svg
new file mode 100644
index 000000000..8ca8ead93
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="monument" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path11719-7" d="M7.5,0L6,2.5v7h3v-7L7.5,0z M3,11.5&#xA;&#x9;L3,15h9v-3.5L10.5,10h-6L3,11.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@1x.png
deleted file mode 100644
index 8686d5411..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@2x.png
deleted file mode 100644
index 202970fbc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@3x.png
deleted file mode 100644
index 05ad27f4a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/monument.imageset/monument@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/Contents.json
index 766b2fc5d..51ea9947c 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"mountain@1x.png","idiom":"universal","scale":"1x"},{"filename":"mountain@2x.png","idiom":"universal","scale":"2x"},{"filename":"mountain@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"mountain.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain.svg
new file mode 100644
index 000000000..d48d2449f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="mountain">
+  <path d="m7.5 1c-.3 0-.4.2-.6.4l-5.8 9.5c-.1.1-.1.3-.1.4 0 .5.4.7.7.7h11.6c.4 0 .7-.2.7-.7 0-.2 0-.2-.1-.4l-5.7-9.5c-.2-.2-.4-.4-.7-.4zm0 1.5 3.3 5.5h-.8l-1.5-1.5-1 1.5-1-1.5-1.5 1.5h-.9z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@1x.png
deleted file mode 100644
index 8b38dba94..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@2x.png
deleted file mode 100644
index 92e2fdedd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@3x.png
deleted file mode 100644
index 771226835..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/mountain.imageset/mountain@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/museum.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/museum.imageset/Contents.json
new file mode 100644
index 000000000..618146414
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/museum.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"museum.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/museum.imageset/museum.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/museum.imageset/museum.svg
new file mode 100644
index 000000000..1c1596d3b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/museum.imageset/museum.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="museum" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path7509" d="M7.5,0L1,3.5V4h13V3.5L7.5,0z M2,5v5l-1,1.6V13h13v-1.4L13,10V5H2z M4,6h1v5.5H4V6z M7,6h1v5.5H7V6z M10,6h1&#xA;&#x9;v5.5h-1V6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/Contents.json
index 550419b9d..1d3ef6a49 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"music@1x.png","idiom":"universal","scale":"1x"},{"filename":"music@2x.png","idiom":"universal","scale":"2x"},{"filename":"music@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"music.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music.svg
new file mode 100644
index 000000000..5096988e1
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="music">
+  <path d="m12.5 0c-.0804.0008-.1594.0213999-.23.0599999l-8.77 2.4400001c-.2761 0-.5.2239-.5.5v6.28c-.3029-.1798-.6478-.2763-1-.28-1.1046 0-2 .8954-2 2s.8954 2 2 2 2-.8954 2-2v-4.64l8-2.22v3.64c-.3029-.1798-.6478-.2763-1-.28-1.1046 0-2 .8954-2 2s.8954 2 2 2 2-.8954 2-2v-9c0-.2761-.2239-.5-.5-.5zm-.5 3.14-8 2.22v-2l8-2.22z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@1x.png
deleted file mode 100644
index 04f33b322..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@2x.png
deleted file mode 100644
index 9accd516f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@3x.png
deleted file mode 100644
index f9c7163c3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/music.imageset/music@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/Contents.json
index 074d39a42..010228f4e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"natural@1x.png","idiom":"universal","scale":"1x"},{"filename":"natural@2x.png","idiom":"universal","scale":"2x"},{"filename":"natural@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"natural.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural.svg
new file mode 100644
index 000000000..3b5778b80
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="natural" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M8.753,6.278a.5.5,0,0,1-.51,0A4.109,4.109,0,0,1,6.5,3.5a2.779,2.779,0,0,0-.59-1.506l-.019-.027a.257.257,0,0,1-.056-.144.237.237,0,0,1,.25-.25.264.264,0,0,1,.057.011A3.523,3.523,0,0,1,7.5,2.5L8.28.94a.246.246,0,0,1,.44,0L9.5,2.5a3.4,3.4,0,0,1,1.339-.907.283.283,0,0,1,.1-.021c.175.009.212.119.221.249a.35.35,0,0,1-.043.141A5.2,5.2,0,0,0,10.5,3.5,4.113,4.113,0,0,1,8.753,6.278ZM5,8H6.289a.25.25,0,0,0,.25-.25.241.241,0,0,0-.061-.15L4.7,5.235a.255.255,0,0,0-.391,0L2.518,7.589a.274.274,0,0,0-.062.161.25.25,0,0,0,.25.25H4L1.335,10.6a.273.273,0,0,0-.058.152A.25.25,0,0,0,1.529,11H3L1.435,12.565a.255.255,0,0,0,.18.435H4v1H5V13H7.385a.255.255,0,0,0,.18-.435L6,11H7.471a.25.25,0,0,0,.25-.25.233.233,0,0,0-.058-.149Zm9.345,3.748a.252.252,0,0,1-.252.252H8.908a.252.252,0,0,1-.226-.365L11.27,6.451a.252.252,0,0,1,.451,0l2.6,5.184h0A.251.251,0,0,1,14.345,11.748ZM12.75,10,11.5,7.5,10.25,10Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@1x.png
deleted file mode 100644
index dd7ae0061..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@2x.png
deleted file mode 100644
index 640b099e3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@3x.png
deleted file mode 100644
index d0e41ee83..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/natural.imageset/natural@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/nightclub.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/nightclub.imageset/Contents.json
new file mode 100644
index 000000000..554dbcd41
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/nightclub.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "nightclub.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/nightclub.imageset/nightclub.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/nightclub.imageset/nightclub.svg
new file mode 100644
index 000000000..3963e5cc1
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/nightclub.imageset/nightclub.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="nightclub" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13 0C13.1443 0 13.2674 0.104298 13.2911 0.246598L13.3856 0.813808C13.454 1.22429 13.7757 1.54595 14.1862 1.61437L14.7534 1.7089C14.8957 1.73262 15 1.85574 15 2C15 2.14426 14.8957 2.26738 14.7534 2.2911L14.1862 2.38563C13.7757 2.45405 13.454 2.77571 13.3856 3.18619L13.2911 3.7534C13.2674 3.8957 13.1443 4 13 4C12.8557 4 12.7326 3.8957 12.7089 3.7534L12.6144 3.18619C12.546 2.77571 12.2243 2.45405 11.8138 2.38563L11.2466 2.2911C11.1043 2.26738 11 2.14426 11 2C11 1.85574 11.1043 1.73262 11.2466 1.7089L11.8138 1.61437C12.2243 1.54595 12.546 1.22429 12.6144 0.813808L12.7089 0.246598C12.7326 0.104297 12.8557 0 13 0Z M3.2057 0.18557L6.28947 2.90344C6.91966 3.45885 7.67962 3.84654 8.4992 4.03072L10.3991 4.45767C11.141 4.62438 11.6408 5.31986 11.5622 6.07618L11.3605 8.01788C11.3261 8.34867 11.0473 8.6 10.7147 8.6C10.3316 8.6 10.0318 8.26993 10.0685 7.88855L10.1872 6.65628C10.2209 6.30677 9.9461 6.00427 9.59497 6.00427C9.26638 6.00427 9 6.27065 9 6.59924V8.85444C9 9.2827 9.09169 9.70599 9.2689 10.0959L11.0612 14.039C11.2667 14.491 10.9362 15.0043 10.4396 15.0043C10.1719 15.0043 9.92887 14.8478 9.81807 14.604L7.75182 10.0583C7.59846 9.72088 7.26206 9.50427 6.89146 9.50427C6.64081 9.50427 6.40043 9.60384 6.2232 9.78108L5.39172 10.6126C5.1354 10.8689 4.95356 11.19 4.86564 11.5417L4.13368 14.4695C4.05512 14.7838 3.77275 15.0043 3.44881 15.0043C2.97593 15.0043 2.63676 14.5484 2.77264 14.0955L3.78266 10.7287C3.92532 10.2532 4.18377 9.82051 4.53482 9.46945L5.12132 8.88295C5.68393 8.32034 6 7.55728 6 6.76163V5.61646C6 5.06365 5.77118 4.53548 5.36788 4.15739L2.21958 1.20586C2.07948 1.07452 2 0.891048 2 0.699015C2 0.315319 2.31105 0.00427246 2.69474 0.00427246H2.7258C2.90251 0.00427246 3.07314 0.0687345 3.2057 0.18557Z M8.5 3.00427C9.32843 3.00427 10 2.3327 10 1.50427C10 0.675845 9.32843 0.00427246 8.5 0.00427246C7.67157 0.00427246 7 0.675845 7 1.50427C7 2.3327 7.67157 3.00427 8.5 3.00427Z M2.2911 3.7466C2.26738 3.6043 2.14426 3.5 2 3.5C1.85574 3.5 1.73262 3.6043 1.7089 3.7466L1.61437 4.31381C1.54595 4.72429 1.22429 5.04595 0.813808 5.11437L0.246598 5.2089C0.104298 5.23262 0 5.35574 0 5.5C0 5.64426 0.104297 5.76738 0.246598 5.7911L0.813808 5.88563C1.22429 5.95405 1.54595 6.27571 1.61437 6.68619L1.7089 7.2534C1.73262 7.3957 1.85574 7.5 2 7.5C2.14426 7.5 2.26738 7.3957 2.2911 7.2534L2.38563 6.68619C2.45405 6.27571 2.77571 5.95405 3.18619 5.88563L3.7534 5.7911C3.8957 5.76738 4 5.64426 4 5.5C4 5.35574 3.8957 5.23262 3.7534 5.2089L3.18619 5.11437C2.77571 5.04595 2.45405 4.72429 2.38563 4.31381L2.2911 3.7466Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/Contents.json
index 7aa841584..211404f01 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"observation-tower@1x.png","idiom":"universal","scale":"1x"},{"filename":"observation-tower@2x.png","idiom":"universal","scale":"2x"},{"filename":"observation-tower@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"observation-tower.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower.svg
new file mode 100644
index 000000000..ba37dac39
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="observation-tower">
+  <path d="M12 12.5H11.5L10 9V7C10.9951 7 10.9951 6.25 10.9951 6.25L11.5 3C11.5 3 11.5 2.5 11 2.5H10C10 2.5 10 2 9.5 2H8.5V1.5C8.5 1.5 8.5 0.5 7.5 0.5C6.5 0.5 6.5 1.5 6.5 1.5V2H5.5C5 2 5 2.5 5 2.5H4C3.5 2.5 3.5 3 3.5 3L4.0049 6.25C4.0049 6.25 4.0049 7 5 7V9L3.5 12.5H3C3 12.5 2 12.5 2 13.25C2 14 3 14 3 14H12C12 14 13 14 13 13.25C13 12.5 12 12.5 12 12.5ZM10.25 3.5L10 5H5L4.75 3.4971L10.25 3.5ZM8.5 7V8H6.5V7H8.5ZM6.5006 9.4971H8.4994L9.5 12.5H5.5L6.5006 9.4971Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@1x.png
deleted file mode 100644
index a884e6800..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@2x.png
deleted file mode 100644
index 3847e8abe..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@3x.png
deleted file mode 100644
index 834412012..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/observation-tower.imageset/observation-tower@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/Contents.json
index a97fa95a1..d478f830a 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"optician@1x.png","idiom":"universal","scale":"1x"},{"filename":"optician@2x.png","idiom":"universal","scale":"2x"},{"filename":"optician@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"optician.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician.svg
new file mode 100644
index 000000000..6b06603b0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="optician">
+  <path d="M1.78483 3.81169C2.03375 3.31421 2.54231 3 3.09859 3C3.48821 3 3.86186 3.15477 4.13736 3.43027L4.85354 4.14645C5.0488 4.34171 5.0488 4.65829 4.85354 4.85355C4.65827 5.04882 4.34169 5.04882 4.14643 4.85355L3.43017 4.1373C3.34226 4.04939 3.22303 4 3.09871 4C2.92116 4 2.75884 4.10032 2.67944 4.25912L1.309 7H5.2476C6.0654 7 6.7487 7.5656 6.941 8.3245C7.1146 8.2834 7.3009 8.25 7.5 8.25C7.6991 8.25 7.8854 8.2835 8.059 8.3246C8.2513 7.5656 8.9344 7 9.752 7H13.691L12.3206 4.25912C12.2412 4.10032 12.0788 4 11.9013 4C11.777 4 11.6577 4.04939 11.5698 4.1373L10.8536 4.85355C10.6583 5.04882 10.3417 5.04882 10.1465 4.85355C9.9512 4.65829 9.9512 4.34171 10.1465 4.14645L10.8626 3.43027C11.1381 3.15477 11.5118 3 11.9014 3C12.4577 3 12.9663 3.31421 13.2152 3.81169L14.9414 7.26172L14.9404 7.26308C14.9784 7.33359 15 7.41428 15 7.5V8.5C15 8.7761 14.7761 9 14.5 9H14V9.5C14 11.0889 12.998 12 11.25 12H10.75C9.002 12 8 11.0889 8 9.5V9.3413C7.8499 9.2933 7.6693 9.25 7.5 9.25C7.3307 9.25 7.1503 9.2933 7 9.3413V9.5C7 11.0889 5.9976 12 4.25 12H3.75C2.0024 12 1 11.0889 1 9.5V9H0.4992C0.2235 9 0 8.7765 0 8.5007V7.5C0 7.41428 0.0215731 7.33359 0.0595866 7.26308L0.0585938 7.26172L1.78483 3.81169ZM9.752 8C9.3369 8 9 8.3374 9 8.7524V9.5C9 10.1982 9.1992 11 10.75 11H11.25C12.8008 11 13 10.1982 13 9.5V8.7529C13 8.3379 12.6621 8 12.2471 8H9.752ZM2.7529 8C2.3379 8 2 8.3374 2 8.7524V9.5C2 10.1982 2.1987 11 3.75 11H4.25C5.8013 11 6 10.1982 6 9.5V8.7524C6 8.3374 5.6626 8 5.2475 8H2.7529Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@1x.png
deleted file mode 100644
index 22ebf6e21..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@2x.png
deleted file mode 100644
index c7400f61b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@3x.png
deleted file mode 100644
index 1602248eb..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/optician.imageset/optician@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/Contents.json
index 9fa4119c2..e5d479798 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"paint@1x.png","idiom":"universal","scale":"1x"},{"filename":"paint@2x.png","idiom":"universal","scale":"2x"},{"filename":"paint@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"paint.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint.svg
new file mode 100644
index 000000000..6f99a154b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="paint">
+  <path d="m13.5 3.5h-1v-.9973c0-.2777-.2251-.5027-.5027-.5027h-10.4946c-.2776 0-.5027.225-.5027.5027v2.9946c0 .2776.2251.5027.5027.5027h10.4946c.2776 0 .5027-.2251.5027-.5027v-.9973h.5v3.1021l-6.1123 1.4106c-.2271.0527-.3877.2549-.3877.4873v1.5074c-.2783.02-.5.246-.5.5295v2.9261c0 .2966.2404.537.5369.537h.9261c.2966 0 .537-.2404.537-.5369v-2.9261c0-.2834-.2217-.5095-.5-.5295v-1.11l6.1123-1.4102c.2266-.0522.3877-.2544.3877-.4873v-4c0-.2764-.2236-.5-.5-.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@1x.png
deleted file mode 100644
index 8ecee9be3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@2x.png
deleted file mode 100644
index 8ca4685dd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@3x.png
deleted file mode 100644
index 16fca4276..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/paint.imageset/paint@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/Contents.json
index 63fdd22f9..332dfac8f 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"park-alt1@1x.png","idiom":"universal","scale":"1x"},{"filename":"park-alt1@2x.png","idiom":"universal","scale":"2x"},{"filename":"park-alt1@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"park-alt1.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1.svg
new file mode 100644
index 000000000..b8400c1a5
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="park-alt1" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M9.428,10.429a.269.269,0,0,1-.074-.18A.25.25,0,0,1,9.6,10h1.447a.25.25,0,0,0,.25-.25.258.258,0,0,0-.079-.179L9.07,7.419a.3.3,0,0,1-.063-.17A.249.249,0,0,1,9.257,7H10.4a.251.251,0,0,0,.25-.251.247.247,0,0,0-.077-.178L8.432,4.434,8.418,4.42a.262.262,0,0,1-.066-.17A.25.25,0,0,1,8.6,4h.866a.25.25,0,0,0,.25-.25.246.246,0,0,0-.068-.164h.006L7.7,1.238a.253.253,0,0,0-.042-.044A.249.249,0,0,0,7.5,1.139h0a.249.249,0,0,0-.158.055.253.253,0,0,0-.042.044L5.352,3.586a.246.246,0,0,0-.068.164.25.25,0,0,0,.25.25H6.4a.241.241,0,0,1,.184.42l-.014.014L4.431,6.571a.247.247,0,0,0-.077.178A.251.251,0,0,0,4.6,7H5.745a.249.249,0,0,1,.25.249.3.3,0,0,1-.063.17L3.782,9.571A.258.258,0,0,0,3.7,9.75a.25.25,0,0,0,.25.25H5.4a.25.25,0,0,1,.248.249.269.269,0,0,1-.074.18l-2.14,2.132-.009.009a.248.248,0,0,0,0,.351A.256.256,0,0,0,3.605,13H7v1l1-.008V13h3.391a.263.263,0,0,0,.26-.254.248.248,0,0,0-.071-.177Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@1x.png
deleted file mode 100644
index 0062098c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@2x.png
deleted file mode 100644
index 3cf92c246..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@3x.png
deleted file mode 100644
index 40fc0cd06..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/park-alt1.imageset/park-alt1@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/park.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/park.imageset/Contents.json
new file mode 100644
index 000000000..6d4169d54
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/park.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"park.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/park.imageset/park.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/park.imageset/park.svg
new file mode 100644
index 000000000..103552956
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/park.imageset/park.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="park" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M14,5.75c0.0113-0.6863-0.3798-1.3159-1-1.61C12.9475,3.4906,12.4014,2.9926,11.75,3&#xA;&#x9;c-0.0988,0.0079-0.1962,0.0281-0.29,0.06c-0.0607-0.66-0.6449-1.1458-1.3048-1.0851C9.8965,1.9987,9.6526,2.1058,9.46,2.28l0,0&#xA;&#x9;c0-0.6904-0.5596-1.25-1.25-1.25S6.96,1.5896,6.96,2.28C6.96,2.28,7,2.3,7,2.33C6.4886,1.8913,5.7184,1.9503,5.2797,2.4618&#xA;&#x9;C5.1316,2.6345,5.0347,2.8451,5,3.07C4.8417,3.0195,4.6761,2.9959,4.51,3C3.6816,2.9931,3.0044,3.659,2.9975,4.4874&#xA;&#x9;C2.9958,4.6872,3.0341,4.8852,3.11,5.07C2.3175,5.2915,1.8546,6.1136,2.0761,6.9061C2.2163,7.4078,2.6083,7.7998,3.11,7.94&#xA;&#x9;c0.2533,0.7829,1.0934,1.2123,1.8763,0.959C5.5216,8.7258,5.9137,8.2659,6,7.71C6.183,7.8691,6.4093,7.9701,6.65,8v5L5,14h5l-1.6-1&#xA;&#x9;v-2c0.7381-0.8915,1.6915-1.5799,2.77-2c0.8012,0.1879,1.603-0.3092,1.7909-1.1103C12.9893,7.7686,13.0025,7.6444,13,7.52&#xA;&#x9;c0.0029-0.0533,0.0029-0.1067,0-0.16C13.6202,7.0659,14.0113,6.4363,14,5.75z M8.4,10.26V6.82C8.6703,7.3007,9.1785,7.5987,9.73,7.6&#xA;&#x9;h0.28c0.0156,0.4391,0.2242,0.849,0.57,1.12C9.7643,9.094,9.0251,9.6162,8.4,10.26z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/Contents.json
index fdfdbbca5..ddba6f78f 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"parking-garage@1x.png","idiom":"universal","scale":"1x"},{"filename":"parking-garage@2x.png","idiom":"universal","scale":"2x"},{"filename":"parking-garage@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"parking-garage.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage.svg
new file mode 100644
index 000000000..295403e00
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="parking-garage" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M10.5,10.14c-0.6637,0.4788-1.4732,0.7121-2.29,0.66h-1.9V14h-1.9V5h3.92&#xA;&#x9;c0.7801-0.0414,1.5484,0.2041,2.16,0.69c0.5779,0.5595,0.875,1.3483,0.81,2.15C11.4042,8.6892,11.1088,9.5388,10.5,10.14z M9,6.9&#xA;&#x9;C8.711,6.6881,8.3579,6.5822,8,6.6H6.31v2.65H8c0.3612,0.0191,0.717-0.0947,1-0.32c0.2559-0.2675,0.3867-0.6308,0.36-1&#xA;&#x9;C9.4072,7.5493,9.274,7.1684,9,6.9z M14.41,4.21c0.114-0.2486,0.007-0.5427-0.24-0.66L7.5,0.45l-6.71,3.1&#xA;&#x9;C0.5387,3.666,0.429,3.9637,0.545,4.215C0.661,4.4663,0.9587,4.576,1.21,4.46l0,0L7.5,1.55l6.29,2.9&#xA;&#x9;c0.2486,0.114,0.5427,0.007,0.66-0.24H14.41z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@1x.png
deleted file mode 100644
index 587df70b0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@2x.png
deleted file mode 100644
index 2ab074b2c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@3x.png
deleted file mode 100644
index 9f6ef7531..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-garage.imageset/parking-garage@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-paid.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-paid.imageset/Contents.json
new file mode 100644
index 000000000..0305ba9cf
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-paid.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"parking-paid.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-paid.imageset/parking-paid.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-paid.imageset/parking-paid.svg
new file mode 100644
index 000000000..d9978e0f7
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking-paid.imageset/parking-paid.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="parking-paid">
+  <path d="M1 13V2h4.5a3.5 3.5 0 0 1 3.21 2.103 3.36 3.36 0 0 0-.504.676c-.23.41-.232.837-.174 1.154l.3 1.625A3.495 3.495 0 0 1 5.5 9H3v4H1Zm4.5-6a1.5 1.5 0 1 0 0-3H3v3h2.5Zm3.516-1.248a.716.716 0 0 1 .062-.484C9.315 4.848 9.978 4 11.5 4c1.521 0 2.185.847 2.421 1.268a.716.716 0 0 1 .064.484L13.019 11H12v2h-1v-2H9.981l-.965-5.248ZM12.75 7 13 5.655C12.83 5.409 12.42 5 11.5 5s-1.33.41-1.5.655L10.25 7h2.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking.imageset/Contents.json
new file mode 100644
index 000000000..998d7f41d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"parking.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/parking.imageset/parking.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking.imageset/parking.svg
new file mode 100644
index 000000000..5a269d777
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/parking.imageset/parking.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="parking">
+  <path d="M4 2V13H6V9H8.5C10.433 9 12 7.433 12 5.5C12 3.567 10.433 2 8.5 2H4ZM6 7V4H8.5C9.32843 4 10 4.67157 10 5.5C10 6.32843 9.32843 7 8.5 7H6Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/pharmacy.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/pharmacy.imageset/Contents.json
new file mode 100644
index 000000000..3e03f9a95
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/pharmacy.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"pharmacy.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/pharmacy.imageset/pharmacy.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/pharmacy.imageset/pharmacy.svg
new file mode 100644
index 000000000..c4de245ae
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/pharmacy.imageset/pharmacy.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="pharmacy" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M9.5,4l1.07-1.54c0.0599,0.0046,0.1201,0.0046,0.18,0c0.6904-0.0004,1.2497-0.5603,1.2494-1.2506&#xA;&#x9;C11.999,0.519,11.4391-0.0404,10.7487-0.04C10.0584-0.0396,9.499,0.5203,9.4994,1.2106c0,0.0131,0.0002,0.0262,0.0006,0.0394&#xA;&#x9;c0,0,0,0.07,0,0.1L7,4H9.5z M12,6V5H3v1l1.5,3.5L3,13v1h9v-1l-1-3.5L12,6z M10,10H8v2H7v-2H5V9h2V7h1v2h2V10z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/Contents.json
index 41a081b1e..8086046bd 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"picnic-site@1x.png","idiom":"universal","scale":"1x"},{"filename":"picnic-site@2x.png","idiom":"universal","scale":"2x"},{"filename":"picnic-site@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"picnic-site.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site.svg
new file mode 100644
index 000000000..ea6841377
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="picnic-site" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect4760" d="M4,3C3.446,3,3,3.446,3,4s0.446,1,1,1h1.2969&#xA;&#x9;L4.6523,7H2.5c-0.554,0-1,0.446-1,1s0.446,1,1,1h1.5098L3.041,12.0098c-0.1284,0.3939,0.0868,0.8173,0.4807,0.9457&#xA;&#x9;s0.8173-0.0868,0.9457-0.4807c0.0005-0.0013,0.0009-0.0027,0.0013-0.004L5.5859,9h3.8281l1.1172,3.4707&#xA;&#x9;c0.1273,0.3943,0.5501,0.6107,0.9443,0.4834s0.6107-0.5501,0.4834-0.9443l0,0L10.9902,9H12.5c0.554,0,1-0.446,1-1s-0.446-1-1-1&#xA;&#x9;h-2.1523L9.7031,5H11c0.554,0,1-0.446,1-1s-0.446-1-1-1H4z M6.873,5H8.127l0.6445,2h-2.543L6.873,5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@1x.png
deleted file mode 100644
index 2c65c5bca..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@2x.png
deleted file mode 100644
index 0a9203d85..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@3x.png
deleted file mode 100644
index 0c5069a5f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/picnic-site.imageset/picnic-site@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/Contents.json
index 19bec5a1d..dc4258a81 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"pitch@1x.png","idiom":"universal","scale":"1x"},{"filename":"pitch@2x.png","idiom":"universal","scale":"2x"},{"filename":"pitch@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"pitch.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch.svg
new file mode 100644
index 000000000..c30158059
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="pitch" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M5,3C4.4477,3,4,2.5523,4,2s0.4477-1,1-1s1,0.4477,1,1S5.5523,3,5,3z M12.5,10H10L9,7L8,5.25L9,5l2.3,1l0,0&#xA;&#x9;c0.2761,0.1105,0.5895-0.0239,0.7-0.3S11.9761,5.1105,11.7,5l0,0L9,4H7L5,5L4,6H2.5C2.2239,6,2,6.2239,2,6.5S2.2239,7,2.5,7H5l1-1&#xA;&#x9;l1,2l-2,2v3.5C5,13.7761,5.2239,14,5.5,14S6,13.7761,6,13.5v-3.11L8,9l1,2h3.5c0.2761,0,0.5-0.2239,0.5-0.5S12.7761,10,12.5,10z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@1x.png
deleted file mode 100644
index 04354cfc2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@2x.png
deleted file mode 100644
index cf5aa9a61..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@3x.png
deleted file mode 100644
index bd0b7b7b9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/pitch.imageset/pitch@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/Contents.json
index 8834fdbf5..05a08a855 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"place-of-worship@1x.png","idiom":"universal","scale":"1x"},{"filename":"place-of-worship@2x.png","idiom":"universal","scale":"2x"},{"filename":"place-of-worship@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"place-of-worship.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship.svg
new file mode 100644
index 000000000..0ff8fd4d5
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="place-of-worship" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path9064" d="M7.5,0l-2,2v2h4V2&#xA;&#x9;L7.5,0z M5.5,4.5L4,6h7L9.5,4.5H5.5z M2,6.5c-0.5523,0-1,0.4477-1,1V13h2V7.5C3,6.9477,2.5523,6.5,2,6.5z M4,6.5V13h7V6.5H4z&#xA;&#x9; M13,6.5c-0.5523,0-1,0.4477-1,1V13h2V7.5C14,6.9477,13.5523,6.5,13,6.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@1x.png
deleted file mode 100644
index 671d732dc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@2x.png
deleted file mode 100644
index 02f1f9c86..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@3x.png
deleted file mode 100644
index 4de5e7046..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/place-of-worship.imageset/place-of-worship@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/Contents.json
index a11a0bafd..c9509a057 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"playground@1x.png","idiom":"universal","scale":"1x"},{"filename":"playground@2x.png","idiom":"universal","scale":"2x"},{"filename":"playground@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"playground.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground.svg
new file mode 100644
index 000000000..d2670ed9d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="playground" height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg">
+  <path d="m3.00002 1.15c.2091-.8016 1.0284-1.2819 1.83-1.0729s1.2819 1.0284 1.0729 1.83c-.2003.7681-.9643 1.2471-1.7429 1.0929-.8126-.161-1.3409-.9502-1.18-1.7629.0058-.0292.0125-.0583.02-.0871zm10.99998 11.17c.1032.5426-.2531 1.066-.7956 1.1692-.0015.0003-.0029.0006-.0044.0008-.4252.086-.8574-.1119-1.07-.49l-1.68-3.37-1.44998.29-.22.08h-.06v2.15l.62-.15h.14c.2871.0054.5155.2425.5101.5297-.0039.2064-.1295.391-.3201.4703l-5 1c-.0563.0095-.1137.0095-.17 0-.2872 0-.52-.2328-.52-.52 0-.2099.1262-.3993.32-.48l4.15-.83v-2.17l-3.22.58c-.164.0423-.336.0423-.5 0-.3394-.0867-.6088-.3446-.71-.68h-.02l-1-4.07c-.0312-.1416-.0312-.2884 0-.43.0936-.387.4078-.6815.8-.75l4.7-.52v-4.13h.22v4.1h.06l.22-.02.4-.08h.21c.2673.0643.43258.3323.37.6-.0439.235-.251.4041-.49.4l-.49.08h-.22-.06v2.86h.06l.22-.06 1.80998-.36c.4275-.0352.8299.2062 1 .6l2 3.94c.077.0758.1411.1636.19.26zm-5.49998-7.19-2.5.27.74 2.94 1.76-.34z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@1x.png
deleted file mode 100644
index df20595a5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@2x.png
deleted file mode 100644
index 935f75b5f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@3x.png
deleted file mode 100644
index c7ce3d6a2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/playground.imageset/playground@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/Contents.json
index d88552a42..6691f0ee5 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"police-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"police-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"police-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"police-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP.svg
new file mode 100644
index 000000000..6426baaba
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="police-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M7.5,1A6.5,6.5,0,1,0,14,7.5,6.5,6.5,0,0,0,7.5,1Zm2.6,2.84L7.5,6.44,4.9,3.84A4.4428,4.4428,0,0,1,10.1,3.84ZM3.84,4.9007,6.4394,7.5l-2.6,2.5993A4.4429,4.4429,0,0,1,3.84,4.9007ZM4.9,11.16l2.6-2.6,2.6,2.6A4.4428,4.4428,0,0,1,4.9,11.16Zm6.26-1.0606L8.5606,7.5l2.6-2.5993a4.4429,4.4429,0,0,1-.0006,5.1986Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@1x.png
deleted file mode 100644
index d9f7bee7c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@2x.png
deleted file mode 100644
index dee54d25a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@3x.png
deleted file mode 100644
index 757c44f9e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/police-JP.imageset/police-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/Contents.json
index 0cd9e3864..d9b49e4ab 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"police@1x.png","idiom":"universal","scale":"1x"},{"filename":"police@2x.png","idiom":"universal","scale":"2x"},{"filename":"police@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"police.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police.svg
new file mode 100644
index 000000000..3c32c2ace
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="police" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect4718" d="M5.5,1L6,2h5l0.5-1H5.5z M6,2.5v1.25c0,0,0,2.75,2.5,2.75S11,3.75,11,3.75V2.5H6z M1.9844,3.9863&#xA;&#x9;C1.4329,3.9949,0.9924,4.4485,1,5v4c-0.0001,0.6398,0.5922,1.1152,1.2168,0.9766L5,9.3574V14l5.8789-6.9297&#xA;&#x9;C10.7391,7.0294,10.5947,7,10.4414,7H6.5L3,7.7539V5C3.0077,4.4362,2.5481,3.9775,1.9844,3.9863z M11.748,7.7109L6.4121,14H12&#xA;&#x9;V8.5586C12,8.2451,11.9061,7.9548,11.748,7.7109z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@1x.png
deleted file mode 100644
index 6f85ad069..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@2x.png
deleted file mode 100644
index 113f5aa14..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@3x.png
deleted file mode 100644
index 9f5a8efc4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/police.imageset/police@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/Contents.json
index dbe05a9b7..e427f051c 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"post-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"post-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"post-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"post-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP.svg
new file mode 100644
index 000000000..17ef93875
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="post-JP">
+  <path d="m1.5 4c0-.26522.10536-.51957.29289-.70711.18754-.18753.44189-.29289.70711-.29289h10c.2652 0 .5196.10536.7071.29289.1875.18754.2929.44189.2929.70711s-.1054.51957-.2929.70711c-.1875.18753-.4419.29289-.7071.29289h-10c-.26513 0-.51941-.10529-.70693-.29272-.18752-.18742-.29294-.44165-.29307-.70678zm11 2.5h-10c-.26522 0-.51957.10536-.70711.29289-.18753.18754-.29289.44189-.29289.70711s.10536.51957.29289.70711c.18754.18753.44189.29289.70711.29289h4v4.5c0 .2652.10536.5196.29289.7071.18754.1875.44189.2929.70711.2929s.51957-.1054.70711-.2929c.18753-.1875.29289-.4419.29289-.7071v-4.5h4c.2652 0 .5196-.10536.7071-.29289.1875-.18754.2929-.44189.2929-.70711s-.1054-.51957-.2929-.70711c-.1875-.18753-.4419-.29289-.7071-.29289z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@1x.png
deleted file mode 100644
index bfb8514d5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@2x.png
deleted file mode 100644
index a5b81cc03..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@3x.png
deleted file mode 100644
index 774e72536..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/post-JP.imageset/post-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/Contents.json
index b97e345f1..c65a77cbd 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"post@1x.png","idiom":"universal","scale":"1x"},{"filename":"post@2x.png","idiom":"universal","scale":"2x"},{"filename":"post@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"post.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post.svg
new file mode 100644
index 000000000..1c55253a0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="post">
+  <path d="M13.5 3.65139C13.5 3.86918 13.3912 4.07257 13.2099 4.19338L7.5 8L1.79006 4.19338C1.60885 4.07257 1.5 3.86918 1.5 3.65139C1.5 3.29164 1.79164 3 2.15139 3L12.8486 3C13.2084 3 13.5 3.29164 13.5 3.65139Z M13.5 5.96713V11C13.5 11.5523 13.0523 12 12.5 12H2.5C1.94772 12 1.5 11.5523 1.5 11L1.5 5.96713C1.5 5.76746 1.72254 5.64836 1.88868 5.75912L7.5 9.5L13.1113 5.75912C13.2775 5.64836 13.5 5.76746 13.5 5.96713Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@1x.png
deleted file mode 100644
index f46e4a39d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@2x.png
deleted file mode 100644
index 42a35f989..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@3x.png
deleted file mode 100644
index 74dc798c6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/post.imageset/post@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/Contents.json
index b8da7c06e..711f344b0 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"prison@1x.png","idiom":"universal","scale":"1x"},{"filename":"prison@2x.png","idiom":"universal","scale":"2x"},{"filename":"prison@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"prison.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison.svg
new file mode 100644
index 000000000..879402e0e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="prison" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect3607" d="M3.5,1v13H12V1H3.5z M9.5,2H11v3.5H9.5V2z M4.5,2.0547H6V7H4.5V2.0547z M7,2.0547h1.5V7H7V2.0547z M10.25,6.5&#xA;&#x9;C10.6642,6.5,11,6.8358,11,7.25S10.6642,8,10.25,8l0,0C9.8358,8,9.5,7.6642,9.5,7.25l0,0C9.5,6.8358,9.8358,6.5,10.25,6.5z M7,8&#xA;&#x9;h1.4727L8.5,13H7.0273L7,8z M4.5,8.166H6V13H4.5V8.166z M9.5,9H11v4H9.5V9z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@1x.png
deleted file mode 100644
index 99f802f1f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@2x.png
deleted file mode 100644
index 4f41b0b00..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@3x.png
deleted file mode 100644
index 4afeb2d52..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/prison.imageset/prison@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/Contents.json
index 5a460538b..001760f42 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"racetrack-boat@1x.png","idiom":"universal","scale":"1x"},{"filename":"racetrack-boat@2x.png","idiom":"universal","scale":"2x"},{"filename":"racetrack-boat@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"racetrack-boat.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat.svg
new file mode 100644
index 000000000..4a7337884
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="racetrack-boat">
+  <path d="m10.0643 11.2159c.4691-.5125.9358-1.0224 1.5938-1.2417.9212-.3071 1.5902.0778 1.8665.2805.7241.531 1.3904-.2204.5914-.8064-.4269-.3131-1.4451-.86577-2.7741-.4228-.7202.2401-1.2127.7667-1.70487 1.2931-.40012.4279-.80009.8556-1.32212 1.1291-.61911.3243-1.06486-.0266-1.06486-.6352v-.0121c.00021-.7982-.40819-1.3004-1.25-1.3004-.49071 0-.99216.2582-1.50001.5-1.17511.5596-2.31799 1.2859-3.31714 2.1134-.210639.1751-.243189.4951-.06696.7066.2505.3006.58076.1621.82938-.0379.41361-.3329 1.78116-1.3913 2.93376-1.94.47652-.227.86169-.3421 1.12097-.3421.24997 0 .24997.1016.24997.3396-.00202 1.3264 1.29025 2.1428 2.52893 1.4939.50415-.2641.89557-.6917 1.28535-1.1176zm-7.56426-2.2159c1.5-1 3.25492-2 5-2 .75 0 .75.375.75.75s0 .75.75.75c2.52746 0 5.36316-3.21377 5.49996-5.5l-2.5 1-2.34195-.97445c-.61176-.20392-.92799.74476-.31623.94868l1.15818.52577-1.49996.5-4-1.25c-.23606-.07869-.38872.02744-.5.25l-1.5 3-2.00004 1zm2.5-7c0-.5523.4477-1 1-1s1 .4477 1 1-.4477 1-1 1-1-.4477-1-1z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@1x.png
deleted file mode 100644
index 5574210bc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@2x.png
deleted file mode 100644
index 395cd746d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@3x.png
deleted file mode 100644
index 192728083..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-boat.imageset/racetrack-boat@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/Contents.json
index 168cfd8cc..6afa36d45 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"racetrack-cycling@1x.png","idiom":"universal","scale":"1x"},{"filename":"racetrack-cycling@2x.png","idiom":"universal","scale":"2x"},{"filename":"racetrack-cycling@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"racetrack-cycling.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling.svg
new file mode 100644
index 000000000..491452e5f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="racetrack-cycling">
+  <path d="M8 1L11 4H12C14 4 14 1 12 1H8ZM8.463 3C8.34323 3.00901 8.2307 3.06084 8.146 3.146L5.646 5.646C5.59615 5.69579 5.55739 5.75555 5.53225 5.82136C5.50711 5.88718 5.49617 5.95757 5.50014 6.02791C5.5041 6.09825 5.52289 6.16696 5.55526 6.22953C5.58764 6.2921 5.63287 6.34713 5.688 6.391L7.846 8.117L6.57 10.242C6.50157 10.356 6.48125 10.4926 6.51351 10.6216C6.54577 10.7506 6.62796 10.8616 6.742 10.93C6.85604 10.9984 6.9926 11.0187 7.12162 10.9865C7.25065 10.9542 7.36157 10.872 7.43 10.758L8.93 8.258C8.99256 8.15404 9.01519 8.03088 8.99366 7.91148C8.97214 7.79207 8.90793 7.68457 8.813 7.609L7.304 6.402L9 4.707L10.146 5.854C10.1925 5.9004 10.2477 5.93718 10.3085 5.96223C10.3692 5.98728 10.4343 6.00012 10.5 6H13C13.1326 6 13.2598 5.94732 13.3536 5.85355C13.4473 5.75979 13.5 5.63261 13.5 5.5C13.5 5.36739 13.4473 5.24021 13.3536 5.14645C13.2598 5.05268 13.1326 5 13 5H10.707L8.854 3.146C8.80319 3.09493 8.74195 3.05545 8.67446 3.03025C8.60698 3.00505 8.53484 2.99473 8.463 3ZM2.949 7C2.16222 7.01338 1.4122 7.33534 0.860573 7.89651C0.308947 8.45767 -0.000113683 9.21311 3.13683e-08 10C3.13683e-08 10.7956 0.316071 11.5587 0.87868 12.1213C1.44129 12.6839 2.20435 13 3 13C3.79565 13 4.55871 12.6839 5.12132 12.1213C5.68393 11.5587 6 10.7956 6 10C6.00006 9.60179 5.92083 9.20756 5.76695 8.84028C5.61307 8.47301 5.38761 8.14004 5.10372 7.8608C4.81982 7.58157 4.48318 7.36164 4.11341 7.21385C3.74364 7.06606 3.34815 6.99336 2.95 7H2.949ZM11.949 7C11.1622 7.01338 10.4122 7.33534 9.86057 7.89651C9.30895 8.45767 8.99989 9.21311 9 10C9 10.7956 9.31607 11.5587 9.87868 12.1213C10.4413 12.6839 11.2044 13 12 13C12.7956 13 13.5587 12.6839 14.1213 12.1213C14.6839 11.5587 15 10.7956 15 10C15.0001 9.60179 14.9208 9.20756 14.767 8.84028C14.6131 8.47301 14.3876 8.14004 14.1037 7.8608C13.8198 7.58157 13.4832 7.36164 13.1134 7.21385C12.7436 7.06606 12.3482 6.99336 11.95 7H11.949ZM12.049 8C12.5709 8.01279 13.0671 8.22914 13.4316 8.60283C13.7962 8.97653 14.0002 9.47795 14 10C14 10.5304 13.7893 11.0391 13.4142 11.4142C13.0391 11.7893 12.5304 12 12 12C11.4696 12 10.9609 11.7893 10.5858 11.4142C10.2107 11.0391 10 10.5304 10 10C9.99992 9.73318 10.0532 9.46904 10.1568 9.22314C10.2603 8.97724 10.4121 8.75455 10.603 8.56818C10.7939 8.3818 11.0202 8.23552 11.2686 8.13794C11.5169 8.04036 11.7823 7.99346 12.049 8V8Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@1x.png
deleted file mode 100644
index 518f8a106..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@2x.png
deleted file mode 100644
index 96db0704b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@3x.png
deleted file mode 100644
index f610370f1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-cycling.imageset/racetrack-cycling@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/Contents.json
index b7a0dd50c..c861da3a7 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"racetrack-horse@1x.png","idiom":"universal","scale":"1x"},{"filename":"racetrack-horse@2x.png","idiom":"universal","scale":"2x"},{"filename":"racetrack-horse@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"racetrack-horse.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse.svg
new file mode 100644
index 000000000..3c38add98
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="racetrack-horse">
+  <path d="M10 1C9.73478 1 9.48043 1.10536 9.29289 1.29289C9.10536 1.48043 9 1.73478 9 2C9 2.26522 9.10536 2.51957 9.29289 2.70711C9.48043 2.89464 9.73478 3 10 3C10.2652 3 10.5196 2.89464 10.7071 2.70711C10.8946 2.51957 11 2.26522 11 2C11 1.73478 10.8946 1.48043 10.7071 1.29289C10.5196 1.10536 10.2652 1 10 1ZM5.5 3C5.25 3 4.5 3 5 3.75L6.25 6H4.5C4.223 6.003 3.983 6.1 3.75 6.25C2.944 5.121 2.242 5.552 1.51 6C1.107 6.247 0.694 6.499 0.25 6.5C0.184332 6.50201 0.121902 6.52899 0.0754461 6.57545C0.0289898 6.6219 0.00200653 6.68433 0 6.75C0.00200653 6.81567 0.0289898 6.8781 0.0754461 6.92455C0.121902 6.97101 0.184332 6.99799 0.25 7C0.626 7.02 1.057 6.907 1.488 6.793C2.144 6.62 2.798 6.448 3.254 6.75C3.16 6.937 3 7.5 3 8L2.998 9.51C2.792 9.714 2.619 9.633 2.443 9.55C2.303 9.485 2.16 9.42 2 9.5L1 12.45C1 12.7 1.393 12.752 1.5 12.5L2.25 10.744C2.998 10.744 4.5 10 5 9L9 10L11.5 12.5C11.697 12.697 12.12 12.362 11.96 12.115L10 9L12 6.5C12.248 7 12.495 7 12.986 7H13L13.6 7.75C13.988 8.235 14.82 7.743 14.5 7.25L12.834 4.79L13 4.5C13.062 4.313 12.637 3.924 12.5 4L10.5 5.5L8.89 3.187C8.84314 3.12862 8.78377 3.08151 8.71627 3.04915C8.64877 3.01678 8.57486 2.99999 8.5 3H5.5ZM9 5.25L9.5 6L6.777 7.916C6.72243 7.95469 6.66065 7.98204 6.59532 7.99643C6.52999 8.01081 6.46244 8.01194 6.39666 7.99975C6.33089 7.98756 6.26823 7.96229 6.2124 7.92545C6.15656 7.8886 6.10869 7.84093 6.07162 7.78525C6.03454 7.72957 6.00901 7.66701 5.99655 7.60129C5.98409 7.53556 5.98494 7.46801 5.99905 7.40262C6.01317 7.33723 6.04026 7.27534 6.07873 7.22061C6.1172 7.16588 6.16626 7.11943 6.223 7.084L9 5.25Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@1x.png
deleted file mode 100644
index 4c5499060..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@2x.png
deleted file mode 100644
index 317dbfa63..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@3x.png
deleted file mode 100644
index c00bbb9dc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack-horse.imageset/racetrack-horse@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/Contents.json
index b298c4749..3f2a8c581 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"racetrack@1x.png","idiom":"universal","scale":"1x"},{"filename":"racetrack@2x.png","idiom":"universal","scale":"2x"},{"filename":"racetrack@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"racetrack.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack.svg
new file mode 100644
index 000000000..51623ab47
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="racetrack">
+  <path d="M4.99321 1.58228C5.03861 1.30989 4.8546 1.05228 4.58222 1.00688C4.30983 0.961484 4.05222 1.14549 4.00682 1.41788L2.00682 13.4179C1.96142 13.6903 2.14543 13.9479 2.41782 13.9933C2.6902 14.0387 2.94782 13.8547 2.99321 13.5823L3.6632 9.56238C4.46947 9.67976 5.3398 9.7187 6.026 10.2C6.45057 10.505 6.94151 10.7047 7.45839 10.7828C8.424 10.9286 9.28807 10.3976 10.242 10.549L11.531 10.743C11.7908 10.7822 12.0609 10.5828 12.1 10.323L12.984 4.38899L12.988 4.38499C13.0241 4.12469 12.8213 3.85686 12.561 3.82099L11.272 3.62699C10.3092 3.48421 9.44342 3.9997 8.48942 3.85618C8.06155 3.79181 7.65443 3.62915 7.3 3.38099C6.56128 2.86385 5.68119 2.77814 4.81426 2.656L4.99321 1.58228ZM4.40351 5.12049L4.73218 3.14849C5.33161 3.22962 5.96556 3.27693 6.521 3.51699L6.22626 5.48223C5.65576 5.24949 5.01279 5.2037 4.40351 5.12049ZM3.74549 9.0686L4.07436 7.09542C4.69451 7.18147 5.35159 7.22405 5.933 7.46299L6.23273 5.48673C6.89067 5.75614 7.3918 6.21952 8.126 6.32799L8.426 4.34799C9.16402 4.45947 9.77459 4.17131 10.484 4.11399L10.184 6.07999C9.47389 6.1406 8.85956 6.44062 8.124 6.32999L7.83802 8.30784C7.10186 8.19874 6.59996 7.73286 5.939 7.46399L5.639 9.43999C5.04421 9.20148 4.3764 9.15882 3.74549 9.0686ZM7.83898 8.30813C8.57282 8.41936 9.19002 8.11708 9.9 8.05799L10.184 6.07999C10.8385 6.01968 11.5087 6.19133 12.152 6.28899L11.872 8.26499C11.2277 8.16793 10.5563 7.99624 9.901 8.05799L9.601 10.034C8.89229 10.0817 8.26589 10.3943 7.539 10.284L7.83898 8.30813Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@1x.png
deleted file mode 100644
index ee9a8150b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@2x.png
deleted file mode 100644
index 10d419cbe..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@3x.png
deleted file mode 100644
index 552570c48..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/racetrack.imageset/racetrack@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/Contents.json
index 2c1f6991d..5674b3e57 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"rail-light@1x.png","idiom":"universal","scale":"1x"},{"filename":"rail-light@2x.png","idiom":"universal","scale":"2x"},{"filename":"rail-light@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"rail-light.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light.svg
new file mode 100644
index 000000000..18c1a6965
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="rail-light" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path14245" d="M5.5,0C5,0,5,0.5,5,0.5v1C5,1.777,5.223,2,5.5,2S6,1.777,6,1.5V1h1v2H6c0,0-2,0-2,2v3c0,3,3,3,3,3h1&#xA;&#x9;c0,0,3,0,3-3V5c0-2-2-2-2-2H8V1h1v0.5C9,1.777,9.223,2,9.5,2S10,1.777,10,1.5v-1C10,0,9.5,0,9.5,0H5.5z M7.5,4l2.0449,0.7734L10,6.5&#xA;&#x9;C10.1316,7,9.5,7,9.5,7h-4c0,0-0.6316,0-0.5-0.5l0.4551-1.7266L7.5,4z M7.5,8C7.7761,8,8,8.2239,8,8.5S7.7761,9,7.5,9&#xA;&#x9;S7,8.7761,7,8.5S7.2239,8,7.5,8z M4.125,12L3,15h1.5l0.375-1h5.25l0.375,1H12l-1.125-3h-1.5l0.375,1h-4.5l0.375-1H4.125z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@1x.png
deleted file mode 100644
index f93457d49..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@2x.png
deleted file mode 100644
index db0b537f3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@3x.png
deleted file mode 100644
index 92530a92a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-light.imageset/rail-light@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/Contents.json
index 945f23a3c..c8836f082 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"rail-metro@1x.png","idiom":"universal","scale":"1x"},{"filename":"rail-metro@2x.png","idiom":"universal","scale":"2x"},{"filename":"rail-metro@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"rail-metro.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro.svg
new file mode 100644
index 000000000..f59dda06d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="rail-metro" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path5258" d="M5.5,0c0,0-0.75,0-1,1L3,6.5V10c0,1,1,1,1,1h7c0,0,1,0,1-1V6.5L10.5,1c-0.2727-1-1-1-1-1H5.5z M6.5,1.5h2&#xA;&#x9;c0,0,0.5357,0,0.75,1L10,6c0.2146,1.0017-1,1-1,1H6c0,0-1.2146,0.0017-1-1l0.75-3.5C5.9643,1.5,6.5,1.5,6.5,1.5z M5,8&#xA;&#x9;c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1S4,9.5523,4,9S4.4477,8,5,8z M6.75,8h1.5C8.3885,8,8.5,8.1115,8.5,8.25S8.3885,8.5,8.25,8.5&#xA;&#x9;h-1.5C6.6115,8.5,6.5,8.3885,6.5,8.25S6.6115,8,6.75,8z M10,8c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1S9,9.5523,9,9S9.4477,8,10,8z&#xA;&#x9; M4.125,12L3,15h1.5l0.375-1h5.25l0.375,1H12l-1.125-3h-1.5l0.375,1h-4.5l0.375-1H4.125z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@1x.png
deleted file mode 100644
index 4645d5fd6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@2x.png
deleted file mode 100644
index 29dc3b7ee..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@3x.png
deleted file mode 100644
index 368cadad2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail-metro.imageset/rail-metro@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail.imageset/Contents.json
new file mode 100644
index 000000000..92f12febf
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"rail.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rail.imageset/rail.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail.imageset/rail.svg
new file mode 100644
index 000000000..d79333d9c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rail.imageset/rail.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" id="rail" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M 3 1 C 2.4477 1 2 1.4477 2 2 L 2 10 C 2 10.5523 2.4477 11 3 11 L 12 11 C 12.5523 11 13 10.5523 13 10 L 13 2 C 13 1.4477 12.5523 1 12 1 L 3 1 z M 5.75 1.5 L 5.7597656 1.5 L 9.2597656 1.5 C 9.3978656 1.5 9.5097656 1.6119 9.5097656 1.75 C 9.5097656 1.8881 9.3978656 2 9.2597656 2 L 5.75 2 C 5.6119 2 5.5 1.8881 5.5 1.75 C 5.5 1.6119 5.6119 1.5 5.75 1.5 z M 3.5 3 L 7 3 L 7 7 L 3.5 7 C 3.2239 7 3 6.7761 3 6.5 L 3 3.5 C 3 3.2239 3.2239 3 3.5 3 z M 8 3 L 11.5 3 C 11.7761 3 12 3.2239 12 3.5 L 12 6.5 C 12 6.7761 11.7761 7 11.5 7 L 8 7 L 8 3 z M 5 8 C 5.5523 8 6 8.4477 6 9 C 6 9.5523 5.5523 10 5 10 C 4.4477 10 4 9.5523 4 9 C 4 8.4477 4.4477 8 5 8 z M 10 8 C 10.5523 8 11 8.4477 11 9 C 11 9.5523 10.5523 10 10 10 C 9.4477 10 9 9.5523 9 9 C 9 8.4477 9.4477 8 10 8 z M 10.445312 11.994141 C 10.380597 11.999652 10.314981 12.018581 10.253906 12.050781 C 10.030606 12.168381 9.9302313 12.433922 10.019531 12.669922 L 10.189453 13 L 4.8105469 13 L 4.9394531 12.730469 C 5.0371531 12.472169 4.9067375 12.183637 4.6484375 12.085938 C 4.4124375 11.996738 4.1468969 12.097113 4.0292969 12.320312 L 3.0292969 14.320312 C 3.0080969 14.377912 2.9986 14.4387 3 14.5 C 3 14.7761 3.2239 15 3.5 15 C 3.6802 14.999 3.8450875 14.899434 3.9296875 14.740234 L 3.9296875 14.689453 L 4 14.689453 L 4.3105469 14 L 10.689453 14 L 11 14.689453 L 11 14.740234 C 11.0846 14.899434 11.249488 14.999 11.429688 15 C 11.705787 15 11.929688 14.7761 11.929688 14.5 C 11.949587 14.4212 11.949587 14.338566 11.929688 14.259766 L 10.929688 12.259766 C 10.833163 12.076541 10.639459 11.977608 10.445312 11.994141 z " id="path3"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/Contents.json
index 0d89732c3..0303530cf 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"ranger-station@1x.png","idiom":"universal","scale":"1x"},{"filename":"ranger-station@2x.png","idiom":"universal","scale":"2x"},{"filename":"ranger-station@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"ranger-station.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station.svg
new file mode 100644
index 000000000..4373b624a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="ranger-station" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect4911" d="M9,0.5l-2,1v3.7734L2,8v6h4v-4h3&#xA;&#x9;v4h4V8L8,5.2734V4l1-0.5l2,1l2-1v-3l-2,1L9,0.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@1x.png
deleted file mode 100644
index bdf2b02b6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@2x.png
deleted file mode 100644
index afc93d553..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@3x.png
deleted file mode 100644
index 59afb2ad7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/ranger-station.imageset/ranger-station@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/Contents.json
index 6e8898cc7..d6a03325b 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"recycling@1x.png","idiom":"universal","scale":"1x"},{"filename":"recycling@2x.png","idiom":"universal","scale":"2x"},{"filename":"recycling@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"recycling.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling.svg
new file mode 100644
index 000000000..23a77049c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="recycling" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M2.4556,8.6134C2.118,9.2112,1.501,10.3021,2.593,11.0312c0.3432,0.2268,0.7275,0.3836,1.131,0.4614&#xA;&#x9;C4.0314,11.5382,4.0466,12.0111,3.6855,12c-0.3849-0.0193-2.2596-0.1934-2.5606-1.5995c-0.1556-0.8213,0.0204-1.5571,0.504-2.3556&#xA;&#x9;L2.3263,6.812L1.0196,6.0688L4.5,4v4L3.1941,7.3057L2.4556,8.6134z M6.7,2.034c1.155-0.628,1.823,0.43,2.191,1.007l0.8059,1.2631&#xA;&#x9;L8.431,5.112L12,6.986L11.803,2.96l-1.2639,0.8066L9.779,2.578C9.2572,1.8321,8.875,1.2812,7.944,1.033&#xA;&#x9;C6.307,0.7203,5.3007,2.6194,5.311,2.607c-0.1639,0.2871,0.2156,0.5399,0.451,0.21C6.0202,2.4969,6.339,2.2309,6.7,2.034z&#xA;&#x9; M13.294,8.221c-0.0877-0.1897-0.5487-0.1413-0.419,0.267c0.1312,0.3892,0.1845,0.8003,0.157,1.21C12.939,11.01,11.684,11,11,11H9.5&#xA;&#x9;V9.5l-3.5,2l3.488,2.025L9.4926,12H11c0.8906,0.0153,1.5999-0.1759,2.2-0.713C14.4,10.226,13.294,8.221,13.294,8.221z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@1x.png
deleted file mode 100644
index 6efc70748..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@2x.png
deleted file mode 100644
index ada433400..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@3x.png
deleted file mode 100644
index 455b5a6e0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/recycling.imageset/recycling@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/Contents.json
index 792afd46d..296d78acf 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"religious-buddhist@1x.png","idiom":"universal","scale":"1x"},{"filename":"religious-buddhist@2x.png","idiom":"universal","scale":"2x"},{"filename":"religious-buddhist@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"religious-buddhist.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist.svg
new file mode 100644
index 000000000..c3e4b9a0d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="religious-buddhist">
+  <path d="M13.4978,6.9989h-0.5329c-0.09997-1.10708-0.53528-2.15731-1.2478-3.0105l0.378-0.3784&#xA;&#x9;c0.19605-0.19447,0.19733-0.51105,0.00286-0.7071C11.90698,2.71037,11.59733,2.70518,11.4,2.8912l0,0l-0.0123,0.0123L11.01,3.2815&#xA;&#x9;c-0.85331-0.71298-1.90385-1.14864-3.0113-1.2488V1.5c0-0.27614-0.22386-0.5-0.5-0.5s-0.5,0.22386-0.5,0.5v0.5327&#xA;&#x9;C5.8916,2.13306,4.84144,2.56871,3.9884,3.2815L3.61,2.9C3.41007,2.70952,3.09358,2.71717,2.9031,2.9171&#xA;&#x9;c-0.184,0.19312-0.184,0.49668,0,0.6898l0.3784,0.3775C2.56787,4.83856,2.13216,5.89031,2.0327,6.9989H1.5&#xA;&#x9;c-0.27614,0-0.5,0.22386-0.5,0.5s0.22386,0.5,0.5,0.5h0.5327c0.09987,1.10695,0.535,2.15711,1.2473,3.0103l-0.3779,0.3779&#xA;&#x9;c-0.19538,0.19514-0.19557,0.51173-0.00043,0.70711c0.19053,0.19076,0.49798,0.19611,0.69503,0.01209L3.609,12.094l0.3779-0.3779&#xA;&#x9;c0.8533,0.71312,1.90395,1.1488,3.0115,1.2488v0.5329c0,0.27614,0.22386,0.5,0.5,0.5s0.5-0.22386,0.5-0.5v-0.5329&#xA;&#x9;c1.10719-0.10026,2.15744-0.53592,3.0105-1.2488l0.3779,0.3779c0.19514,0.19538,0.51173,0.19557,0.70711,0.00043&#xA;&#x9;c0.19076-0.19053,0.19611-0.49798,0.01209-0.69503l-0.0123-0.0123l0,0l-0.3779-0.3779c0.71283-0.8531,1.14848-1.90333,1.2488-3.0105&#xA;&#x9;h0.5329c0.27609-0.00544,0.49549-0.23366,0.49006-0.50975C13.98227,7.22064,13.76611,7.00435,13.4978,6.9989z M7.9987,3.0505&#xA;&#x9;c0.83871,0.09248,1.63383,0.42154,2.2926,0.9488l-2.15,2.15c-0.04663-0.0218-0.09436-0.04116-0.143-0.058V3.0505H7.9987z&#xA;&#x9; M6.9987,3.0505V6.091c-0.04864,0.01684-0.09637,0.0362-0.143,0.058l-2.15-2.15c0.65897-0.52726,1.45431-0.85622,2.2932-0.9485&#xA;&#x9;H6.9987z M3.9987,4.7062l2.15,2.15c-0.0218,0.04663-0.04116,0.09436-0.058,0.143H3.0505&#xA;&#x9;c0.09243-0.83886,0.42154-1.63413,0.9489-2.293L3.9987,4.7062z M3.0505,7.9987H6.091c0.01687,0.04863,0.03623,0.09636,0.058,0.143&#xA;&#x9;l-2.15,2.15C3.47173,9.63281,3.14276,8.83753,3.0505,7.9987z M6.9989,11.9471c-0.83871-0.09248-1.63383-0.42154-2.2926-0.9488&#xA;&#x9;l2.15-2.15c0.04663,0.0218,0.09436,0.04116,0.143,0.058v3.0405L6.9989,11.9471z M7.9989,11.9471V8.9066&#xA;&#x9;c0.04864-0.01683,0.09638-0.03619,0.143-0.058l2.15,2.15c-0.65895,0.5273-1.4543,0.85627-2.2932,0.9485H7.9989z M10.9989,10.2914&#xA;&#x9;l-2.15-2.15c0.02177-0.04664,0.04113-0.09437,0.058-0.143h3.0415c-0.09276,0.83901-0.42232,1.6343-0.9502,2.293H10.9989z&#xA;&#x9; M8.9066,6.9989c-0.01684-0.04864-0.0362-0.09637-0.058-0.143l2.15-2.15c0.52726,0.65877,0.85632,1.45389,0.9488,2.2926H8.9066&#xA;&#x9;V6.9989z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@1x.png
deleted file mode 100644
index 39000afaa..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@2x.png
deleted file mode 100644
index a82a15989..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@3x.png
deleted file mode 100644
index d36bdc02c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-buddhist.imageset/religious-buddhist@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/Contents.json
index 9da1ed909..214192012 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"religious-christian@1x.png","idiom":"universal","scale":"1x"},{"filename":"religious-christian@2x.png","idiom":"universal","scale":"2x"},{"filename":"religious-christian@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"religious-christian.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian.svg
new file mode 100644
index 000000000..9f7bc2f7e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="religious-christian" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="rect3338" d="M6,0.9552V4H3v3h3v8h3V7h3V4H9V1&#xA;&#x9;c0-1-0.9776-1-0.9776-1H6.9887C6.9887,0,6,0,6,0.9552z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@1x.png
deleted file mode 100644
index 851955861..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@2x.png
deleted file mode 100644
index 6a2ab3fc2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@3x.png
deleted file mode 100644
index 9fd6a563c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-christian.imageset/religious-christian@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/Contents.json
index 2b3c5c415..33cdb7e50 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"religious-jewish@1x.png","idiom":"universal","scale":"1x"},{"filename":"religious-jewish@2x.png","idiom":"universal","scale":"2x"},{"filename":"religious-jewish@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"religious-jewish.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish.svg
new file mode 100644
index 000000000..022c93e57
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="religious-jewish">
+  <path d="M7.50049 0.5L5.49949 4H1L3.49949 7.5L1 11H5.49949L7.50049 14.5L9.50049 11H14L11.5005 7.5L14 4H9.50049L7.50049 0.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@1x.png
deleted file mode 100644
index 601bcbc58..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@2x.png
deleted file mode 100644
index eda3d5b26..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@3x.png
deleted file mode 100644
index aba229ad9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-jewish.imageset/religious-jewish@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/Contents.json
index cb165deb6..51d63a497 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"religious-muslim@1x.png","idiom":"universal","scale":"1x"},{"filename":"religious-muslim@2x.png","idiom":"universal","scale":"2x"},{"filename":"religious-muslim@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"religious-muslim.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim.svg
new file mode 100644
index 000000000..9da54b690
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="religious-muslim">
+  <path d="M12.0962 12.0962C9.55779 14.6346 5.44221 14.6346 2.90381 12.0962C0.365398 9.55779 0.365398 5.44221 2.90381 2.90381C5.44221 0.365398 9.55779 0.365398 12.0962 2.90381C12.2675 3.07512 12.4273 3.25362 12.5754 3.43832C10.5566 1.86336 7.63341 2.00437 5.77643 3.86135C3.76685 5.87092 3.76685 9.12908 5.77643 11.1387C7.63341 12.9956 10.5566 13.1366 12.5754 11.5617C12.4273 11.7464 12.2675 11.9249 12.0962 12.0962Z M10.1 6.5H8L9.7 8L9 10.5L11 9L13 10.5L12.3 8L14 6.5H11.9L11 4.5L10.1 6.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@1x.png
deleted file mode 100644
index c14397aff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@2x.png
deleted file mode 100644
index 0030c0e2f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@3x.png
deleted file mode 100644
index 91bf30293..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-muslim.imageset/religious-muslim@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/Contents.json
index 3928ababb..90932764b 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"religious-shinto@1x.png","idiom":"universal","scale":"1x"},{"filename":"religious-shinto@2x.png","idiom":"universal","scale":"2x"},{"filename":"religious-shinto@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"religious-shinto.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto.svg
new file mode 100644
index 000000000..25312c9d1
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="religious-shinto" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.5,2.5H2.5a.9448.9448,0,0,0-1,1,.9448.9448,0,0,0,1,1H3V12a.9448.9448,0,0,0,1,1,.9448.9448,0,0,0,1-1V8h5v4a.9448.9448,0,0,0,1,1,.9448.9448,0,0,0,1-1V4.5h.5a.9448.9448,0,0,0,1-1,.9448.9448,0,0,0-1-1ZM10,6H8V4.5h2ZM7,6H5V4.5H7Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@1x.png
deleted file mode 100644
index a7d978456..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@2x.png
deleted file mode 100644
index 6667ab976..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@3x.png
deleted file mode 100644
index 123388288..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/religious-shinto.imageset/religious-shinto@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/Contents.json
index 560ab0e13..324ab8a31 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"residential-community@1x.png","idiom":"universal","scale":"1x"},{"filename":"residential-community@2x.png","idiom":"universal","scale":"2x"},{"filename":"residential-community@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"residential-community.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community.svg
new file mode 100644
index 000000000..cdbbe89c5
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="residential-community">
+  <path d="m11.8 12.5v-2.5c.7-.1 1.2-.7 1.2-1.5s-.7-1.5-1.5-1.5-1.5.7-1.5 1.5c0 .7.5 1.4 1.2 1.5v2.5h-4.2v-11.5h-5v11.5h-1v.5h13v-.5zm-5.8-2.5h-3v-1h3zm0-2h-3v-1h3zm0-2h-3v-1h3zm0-2h-3v-1h3z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@1x.png
deleted file mode 100644
index 1fd8687ae..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@2x.png
deleted file mode 100644
index 8c082199d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@3x.png
deleted file mode 100644
index c26537484..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/residential-community.imageset/residential-community@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/Contents.json
index 0b3e3bf6d..4b016ba3d 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"restaurant-bbq@1x.png","idiom":"universal","scale":"1x"},{"filename":"restaurant-bbq@2x.png","idiom":"universal","scale":"2x"},{"filename":"restaurant-bbq@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"restaurant-bbq.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq.svg
new file mode 100644
index 000000000..6e01b0e15
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="restaurant-bbq">
+  <path d="M12.0166,12.5H14.5L12,15V12.5165a1.6189,1.6189,0,0,1-1.1367.4806,1.6,1.6,0,0,1-.9931-.3448A6.7838,6.7838,0,0,1,9.8783,2.3418,1.6179,1.6179,0,0,1,12,2.462V0l2.5,2.5H12.036a1.5927,1.5927,0,0,1,.1225.1289,1.6239,1.6239,0,0,1-.2871,2.2793A3.5148,3.5148,0,0,0,10.75,7.4951a3.5578,3.5578,0,0,0,1.1465,2.6162,1.6352,1.6352,0,0,1,.2325,2.2783C12.0949,12.4315,12.0535,12.4624,12.0166,12.5ZM2.504,0l-1,5.5c-.1464.805,1.7815,1.181,1.75,2L3.004,14a.9625.9625,0,0,0,1,1,.9625.9625,0,0,0,1-1l-.25-6.5c-.0314-.8176,1.7334-1.1808,1.75-2l-1-5.5h-.5l.25,4-.75.5L4.254,0h-.5l-.25,4.5L2.754,4l.25-4Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@1x.png
deleted file mode 100644
index 6b392a291..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@2x.png
deleted file mode 100644
index 1324fc62b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@3x.png
deleted file mode 100644
index a5bde5bbc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-bbq.imageset/restaurant-bbq@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/Contents.json
index 441b6240c..f372dc2f9 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"restaurant-noodle@1x.png","idiom":"universal","scale":"1x"},{"filename":"restaurant-noodle@2x.png","idiom":"universal","scale":"2x"},{"filename":"restaurant-noodle@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"restaurant-noodle.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle.svg
new file mode 100644
index 000000000..8dc5dcf5d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="restaurant-noodle" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M4.457,11.9892,1,8V7H14V8l-3.4961,3.9891ZM3.9882,2.5a.5.5,0,0,0-1,0v.5671l-1.7969.3675a.25.25,0,1,0,.094.4911l1.7029-.2776v.5662l-1.75.0357a.25.25,0,0,0,0,.5l1.75.0357V5.998h1Zm9.5,1.5-7.5.2625V2.9951l7.594-1.0737a.5.5,0,0,0-.1881-.9822L5.9792,2.4555a.4963.4963,0,0,0-.991.0445v.2276l-.493.1009V3.18l.493-.08V4.2974l-.493.01v.4608L13.4882,5a.5.5,0,0,0,0-1ZM10,13H5v.5757h5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@1x.png
deleted file mode 100644
index bafd5b92d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@2x.png
deleted file mode 100644
index 70001ccf2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@3x.png
deleted file mode 100644
index 73b7b90bd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-noodle.imageset/restaurant-noodle@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/Contents.json
index c8f1835cb..df8809a03 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"restaurant-pizza@1x.png","idiom":"universal","scale":"1x"},{"filename":"restaurant-pizza@2x.png","idiom":"universal","scale":"2x"},{"filename":"restaurant-pizza@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"restaurant-pizza.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza.svg
new file mode 100644
index 000000000..91993fe22
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="restaurant-pizza">
+  <path d="M1.393 7.931.025 7.315A14.05 14.05 0 0 1 7.764-.001l.027.07.511 1.331-.003.001a12.613 12.613 0 0 0-6.906 6.53Zm10.963 4.96L2.42 8.414a11.604 11.604 0 0 1 6.354-6.009l.003-.001.817 2.122c-.028-.002-.052-.016-.081-.016a1.062 1.062 0 1 0 .764 1.793l2.413 6.273a.249.249 0 0 1-.334.316ZM7.426 7.52a.925.925 0 1 0-1.849 0 .925.925 0 0 0 1.849 0Zm3.017 2.03a.925.925 0 1 0-.07.353.924.924 0 0 0 .07-.354Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@1x.png
deleted file mode 100644
index 6b92a91ba..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@2x.png
deleted file mode 100644
index 424004a4b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@3x.png
deleted file mode 100644
index fb6af6da4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-pizza.imageset/restaurant-pizza@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/Contents.json
index 5853ec3d6..afc75ca95 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"restaurant-seafood@1x.png","idiom":"universal","scale":"1x"},{"filename":"restaurant-seafood@2x.png","idiom":"universal","scale":"2x"},{"filename":"restaurant-seafood@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"restaurant-seafood.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood.svg
new file mode 100644
index 000000000..bb647dd43
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="restaurant-seafood" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11.433,10.0889h2.49v.75H11.8525A4.81,4.81,0,0,1,13.4751,13.14l-.71.2422a4.01,4.01,0,0,0-1.74-2.1971,1.7775,1.7775,0,0,1-1.0352.4538L8.4374,12.9852H6.5188L4.9839,11.623a2.0222,2.0222,0,0,1-1.0929-.44,4.0093,4.0093,0,0,0-1.7426,2.1988l-.71-.2422a4.8146,4.8146,0,0,1,1.622-2.3007H.99v-.75H3.4839l.8633-.6764L3.3329,7.7567a2.2738,2.2738,0,0,1-.269.0293,2.0192,2.0192,0,0,1-2.0532-2.08c0-2.08,1.979-4.16,1.979-4.16L2.2531,5.9931l1.7255-.0012L4.9913,2.9852l0,2.9956a2.0936,2.0936,0,0,1-.6993,1.4121l.8536,1.3936L5.23,8.7208a3.8669,3.8669,0,0,1,4.4784,0l.0605.0474.869-1.4152a2.1177,2.1177,0,0,1-.6433-1.3722l0-2.9956.9836,3.0067,1.7547.0012-.7367-4.4466s1.982,2.08,1.982,4.16a2.0211,2.0211,0,0,1-2.0562,2.08,2.3125,2.3125,0,0,1-.3441-.0376L10.5676,9.3945l.8407.6593C11.4212,10.0638,11.4218,10.0782,11.433,10.0889Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@1x.png
deleted file mode 100644
index 515112367..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@2x.png
deleted file mode 100644
index dc3503a93..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@3x.png
deleted file mode 100644
index b0d82a53c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-seafood.imageset/restaurant-seafood@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/Contents.json
index fd2fcd9c9..bce41246a 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"restaurant-sushi@1x.png","idiom":"universal","scale":"1x"},{"filename":"restaurant-sushi@2x.png","idiom":"universal","scale":"2x"},{"filename":"restaurant-sushi@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"restaurant-sushi.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi.svg
new file mode 100644
index 000000000..9a2f63022
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="restaurant-sushi" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path4999" d="M5.5,3C5.2239,3,5,3.2239,5,3.5H2.75C1.2265,3.5,0,4.7265,0,6.25c0,0.8274,0.3687,1.5592,0.9434,2.0625&#xA;&#x9;C0.3803,8.6675,0,9.2893,0,10c0,1.0994,0.9006,2,2,2h3.5h2H10c1.0994,0,2-0.9006,2-2c0-0.4883-0.1863-0.9294-0.4805-1.2773&#xA;&#x9;l2.1777,0.9629c0.3716,0.1831,0.8213,0.0303,1.0044-0.3413c0.1831-0.3716,0.0303-0.8213-0.3413-1.0044&#xA;&#x9;c-0.0188-0.0093-0.038-0.0178-0.0576-0.0254l-1.8105-0.8027l1.6309-0.2715c0.4099-0.0599,0.6936-0.4408,0.6337-0.8507&#xA;&#x9;c-0.0544-0.3724-0.3765-0.6469-0.7528-0.6415c-0.0426,0.0003-0.085,0.0042-0.127,0.0117l-2.1309,0.3555&#xA;&#x9;C11.2595,4.9521,10.0387,3.7837,8,3.5488V3.5C8,3.2239,7.7761,3,7.5,3H5.5z M6,4h1v5v2H6V9V4z M9.5,8&#xA;&#x9;c0.259,0,0.4638,0.1974,0.4902,0.4492l0.0762-0.1328c0.1385-0.2399,0.4437-0.3201,0.6836-0.1816s0.3201,0.4418,0.1816,0.6816&#xA;&#x9;l-0.2578,0.4473C10.8727,9.445,11,9.7021,11,10c0,0.5626-0.4374,1-1,1H8V9h1V8.5C9,8.223,9.223,8,9.5,8z M2.4395,8.0703&#xA;&#x9;c0.1934-0.0242,0.3903,0.0662,0.4941,0.2461l0.2012,0.3477C3.226,8.5647,3.3538,8.5,3.5,8.5C3.777,8.5,4,8.723,4,9h1v2H2&#xA;&#x9;c-0.5626,0-1-0.4374-1-1s0.4374-1,1-1h0.1738L2.0684,8.8164C1.9299,8.5765,2.0101,8.2733,2.25,8.1348&#xA;&#x9;C2.31,8.1001,2.375,8.0784,2.4395,8.0703z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@1x.png
deleted file mode 100644
index f18e53e12..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@2x.png
deleted file mode 100644
index 59f66f61f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@3x.png
deleted file mode 100644
index 17660c353..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant-sushi.imageset/restaurant-sushi@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant.imageset/Contents.json
new file mode 100644
index 000000000..08c024d25
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"restaurant.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant.imageset/restaurant.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant.imageset/restaurant.svg
new file mode 100644
index 000000000..56882d039
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/restaurant.imageset/restaurant.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="restaurant" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path11774" d="M3.5,0l-1,5.5c-0.1464,0.805,1.7815,1.181,1.75,2L4,14c-0.0384,0.9993,1,1,1,1s1.0384-0.0007,1-1L5.75,7.5&#xA;&#x9;c-0.0314-0.8176,1.7334-1.1808,1.75-2L6.5,0H6l0.25,4L5.5,4.5L5.25,0h-0.5L4.5,4.5L3.75,4L4,0H3.5z M12,0&#xA;&#x9;c-0.7364,0-1.9642,0.6549-2.4551,1.6367C9.1358,2.3731,9,4.0182,9,5v2.5c0,0.8182,1.0909,1,1.5,1L10,14c-0.0905,0.9959,1,1,1,1&#xA;&#x9;s1,0,1-1V0z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/Contents.json
index 9dc31b61f..81faa9bd8 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"road-accident@1x.png","idiom":"universal","scale":"1x"},{"filename":"road-accident@2x.png","idiom":"universal","scale":"2x"},{"filename":"road-accident@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"road-accident.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident.svg
new file mode 100644
index 000000000..c542b9a2d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="road-accident" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.6,8.7,11.5,6.5a1.05,1.05,0,0,0-.9-.5H4.4a1.05,1.05,0,0,0-.9.5L2.4,8.7,1.16,9.852a.5.5,0,0,0-.16.366V14.5a.5.5,0,0,0,.5.5h2c.2,0,.5-.2.5-.4V14h7v.5c0,.2.2.5.4.5h2.1a.5.5,0,0,0,.5-.5V10.218a.5.5,0,0,0-.16-.366ZM4.5,7h6l1,2h-8ZM5,11.6c0,.2-.3.4-.5.4H2.4c-.2,0-.4-.3-.4-.5V10.4c.1-.3.3-.5.6-.4l2,.4c.2,0,.4.3.4.5Zm8-.1c0,.2-.2.5-.4.5H10.5c-.2,0-.5-.2-.5-.4v-.7c0-.2.2-.5.4-.5l2-.4c.3-.1.5.1.6.4ZM8,4H7L6,0H9ZM1.1,1.8,3.7.3l1.1,4L4,4.7ZM11.3.3l2.6,1.5L11,4.8l-.9-.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@1x.png
deleted file mode 100644
index ecfbf92bd..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@2x.png
deleted file mode 100644
index 1d094cec6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@3x.png
deleted file mode 100644
index 1f1b2de7d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/road-accident.imageset/road-accident@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/Contents.json
index 62a2acde5..25279ae24 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"roadblock@1x.png","idiom":"universal","scale":"1x"},{"filename":"roadblock@2x.png","idiom":"universal","scale":"2x"},{"filename":"roadblock@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"roadblock.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock.svg
new file mode 100644
index 000000000..b6c84e610
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="roadblock">
+  <path d="M7.5 14C11.0899 14 14 11.0899 14 7.5C14 3.91015 11.0899 1 7.5 1C3.91015 1 1 3.91015 1 7.5C1 11.0899 3.91015 14 7.5 14ZM12 6V9H3V6H12Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@1x.png
deleted file mode 100644
index f5f2289b3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@2x.png
deleted file mode 100644
index d86e15a83..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@3x.png
deleted file mode 100644
index e162c831d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/roadblock.imageset/roadblock@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/Contents.json
index 414af586e..078bb9aa4 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"rocket@1x.png","idiom":"universal","scale":"1x"},{"filename":"rocket@2x.png","idiom":"universal","scale":"2x"},{"filename":"rocket@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"rocket.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket.svg
new file mode 100644
index 000000000..7511711f8
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="rocket">
+  <path d="m11.5547 2c-2.14407 0-5.02107 1.471-6.95307 4h-1.6016c-1.1573 0-1.8206.8638-2.277302 1.7773l-.6114 1.2227h1.443402 1.4453l1.5 1.5 1.5 1.5v1.4453 1.4434l1.2227-.6113c.9135-.4568 1.7773-1.1201 1.7773-2.2774v-1.6016c2.52897-1.932 3.99997-4.809 3.99997-6.9531v-1.4453zm-2.55467 3c.5523 0 .99997.4477.99997 1s-.44767 1-.99997 1-1-.4477-1-1 .4477-1 1-1zm-6.5 6-.5.5c-.7222.7222-1 2.5-1 2.5s1.698-.198 2.5-1l.5-.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@1x.png
deleted file mode 100644
index 2d6878ac5..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@2x.png
deleted file mode 100644
index 64ff4ad47..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@3x.png
deleted file mode 100644
index 7f511628c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/rocket.imageset/rocket@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/Contents.json
index bdd72db32..6ce8b51ea 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"school-JP@1x.png","idiom":"universal","scale":"1x"},{"filename":"school-JP@2x.png","idiom":"universal","scale":"2x"},{"filename":"school-JP@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"school-JP.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP.svg
new file mode 100644
index 000000000..227405c5a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="school-JP" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.5,2.9992h-4v-1a1,1,0,0,0-2,0v1h-4a1,1,0,0,0,0,2h.67A10.8169,10.8169,0,0,0,5.15,8.8105c.3331.4313.6594.8248.9785,1.1936a14.3825,14.3825,0,0,1-2.6074,2.117,1,1,0,1,0,.955,1.7581h0A15.65,15.65,0,0,0,7.5,11.4613a15.65,15.65,0,0,0,3.0239,2.4179,1,1,0,1,0,.9551-1.7578,14.3789,14.3789,0,0,1-2.6073-2.1171c.3191-.3688.6453-.7622.9784-1.1935a10.818,10.818,0,0,0,1.98-3.8116h.67a1,1,0,0,0,0-2ZM8.2671,7.5879c-.2614.3385-.5154.6413-.767.937-.2517-.2957-.5057-.5985-.7672-.937A9.5885,9.5885,0,0,1,5.2676,4.9992H9.7319A9.5789,9.5789,0,0,1,8.2671,7.5879Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@1x.png
deleted file mode 100644
index 83040e771..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@2x.png
deleted file mode 100644
index 5f49a6729..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@3x.png
deleted file mode 100644
index 281e14bf4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/school-JP.imageset/school-JP@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/Contents.json
index ee5b036c0..6e698f226 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"school@1x.png","idiom":"universal","scale":"1x"},{"filename":"school@2x.png","idiom":"universal","scale":"2x"},{"filename":"school@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"school.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school.svg
new file mode 100644
index 000000000..f54ef766c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="school">
+  <path d="M5.542 3.647 3.106 3l.443-1.63a.505.505 0 0 1 .618-.352l1.46.392a.5.5 0 0 1 .355.613l-.44 1.624Zm-4.52 7.356a.496.496 0 0 1-.005-.276l1.819-6.726 2.435.647-1.819 6.726a.499.499 0 0 1-.143.237l-1.457 1.347a.152.152 0 0 1-.247-.066l-.583-1.889ZM10 5c-2.25 0-3-.75-3-3 2.25 0 3 .75 3 3Zm-1.4 7.984c-1.37.21-3.126-1.706-3.52-3.8L5.969 5.9c.399-.35.903-.533 1.419-.533a2.71 2.71 0 0 1 1.564.489.964.964 0 0 0 1.089-.01 2.438 2.438 0 0 1 1.46-.479c.77 0 1.643.489 2.05 1.201 1.536 2.696-1.194 6.709-3.144 6.417a.867.867 0 0 1-.255-.093 1.427 1.427 0 0 0-1.302 0 .866.866 0 0 1-.25.092Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@1x.png
deleted file mode 100644
index 63736cf62..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@2x.png
deleted file mode 100644
index db03338b6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@3x.png
deleted file mode 100644
index 9c7d13264..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/school.imageset/school@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/Contents.json
index f3f497b07..720d71e7b 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"scooter@1x.png","idiom":"universal","scale":"1x"},{"filename":"scooter@2x.png","idiom":"universal","scale":"2x"},{"filename":"scooter@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"scooter.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter.svg
new file mode 100644
index 000000000..2000aa845
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="scooter" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M4.908,12a1.5,1.5,0,1,1-2.816,0Zm8.65-6C13.539,6,13,6,13,6V3h.351a.282.282,0,0,0,.223-.148l.268-.536a.334.334,0,0,0,.009-.066A.25.25,0,0,0,13.6,2H13V1.7a.215.215,0,0,0-.2-.2H9.25a.25.25,0,0,0,0,.5H12V6.6L7.6,10H6V7.5A.5.5,0,0,0,5.5,7H5V5H6.75a.25.25,0,0,0,0-.5L2.266,4.034c-.006,0-.01-.007-.016-.007a.25.25,0,0,0-.25.25V4.75A.25.25,0,0,0,2.25,5H3V7H2.5A1.538,1.538,0,0,0,1,8.5v2a.472.472,0,0,0,.442.5C1.461,11,7.5,11,7.5,11L10,10h3.5a.472.472,0,0,0,.5-.442C14,9.539,14,6.5,14,6.5A.472.472,0,0,0,13.558,6ZM12.5,11A1.5,1.5,0,1,0,14,12.5,1.538,1.538,0,0,0,12.5,11Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@1x.png
deleted file mode 100644
index 4d53a8aa2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@2x.png
deleted file mode 100644
index b8666b5f0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@3x.png
deleted file mode 100644
index 24aa07689..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/scooter.imageset/scooter@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/Contents.json
index 65d8bc5e0..21b5701f6 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"shelter@1x.png","idiom":"universal","scale":"1x"},{"filename":"shelter@2x.png","idiom":"universal","scale":"2x"},{"filename":"shelter@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"shelter.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter.svg
new file mode 100644
index 000000000..de89c98dd
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="shelter">
+  <path d="M13 2L1 6V8L2 7.66667V13H12V11H4V7L13 4V2Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@1x.png
deleted file mode 100644
index b794255c3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@2x.png
deleted file mode 100644
index 5871208ff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@3x.png
deleted file mode 100644
index 1b4816d4f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/shelter.imageset/shelter@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/Contents.json
index 2ee34f32b..5ae0c4556 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"shoe@1x.png","idiom":"universal","scale":"1x"},{"filename":"shoe@2x.png","idiom":"universal","scale":"2x"},{"filename":"shoe@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"shoe.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe.svg
new file mode 100644
index 000000000..b18a5b675
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="shoe">
+  <path d="M9.5,7a9.97,9.97,0,0,1-1.315-.948L6.01,3.221a.558.558,0,0,0-1,.279H5V5H3.209a.5.5,0,0,1-.357-.148S2.5,4,2,4H1.5a.5.5,0,0,0-.5.5V9H6.5c1.5,0,2,1,3.5,1h4V9.5C14,8,10.547,7.594,9.5,7Zm0,4a3.131,3.131,0,0,1-1.526-.447A4.1,4.1,0,0,0,6,10H1v1.5a.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5V11a3.134,3.134,0,0,1,1.526.447A4.1,4.1,0,0,0,9.5,12h4a.5.5,0,0,0,.5-.5V11Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@1x.png
deleted file mode 100644
index 078a1a278..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@2x.png
deleted file mode 100644
index b56e8f206..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@3x.png
deleted file mode 100644
index 333718629..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/shoe.imageset/shoe@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shop.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/shop.imageset/Contents.json
new file mode 100644
index 000000000..2a4a26fcd
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/shop.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"shop.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/shop.imageset/shop.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/shop.imageset/shop.svg
new file mode 100644
index 000000000..df8e8dc31
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/shop.imageset/shop.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="shop">
+  <path d="m13.33 5h-1.83l-.39-2.33c-.1601-.7182-.7017-1.2905-1.41-1.49-.3493-.1124-.7131-.173-1.08-.18h-2.24c-.3669.007-.7307.0676-1.08.18-.7083.1995-1.2499.7718-1.41 1.49l-.39 2.33h-1.83c-.2761-.0017-.5013.2208-.503.497-.0003.0519.0074.1035.023.153l1.88 6.3c.1964.6246.7753 1.0496 1.43 1.05h6c.651-.0047 1.2247-.4289 1.42-1.05l1.88-6.3c.0829-.2634-.0635-.5441-.3269-.627-.0463-.0146-.0945-.0223-.1431-.023zm-8.81 0 .36-2.17c.0807-.3625.3736-.6395.74-.7.2463-.0776.5019-.1213.76-.13h2.24c.2614.0078.5205.0515.77.13.3664.0605.6593.3375.74.7l.35 2.17h-6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/Contents.json
index d5bb7ee42..43636de1e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"skateboard@1x.png","idiom":"universal","scale":"1x"},{"filename":"skateboard@2x.png","idiom":"universal","scale":"2x"},{"filename":"skateboard@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"skateboard.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard.svg
new file mode 100644
index 000000000..eeef74f96
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="skateboard">
+  <path d="M1.25 5.25V5H2.75V5.25C2.75 5.94036 3.30964 6.5 4 6.5H11C11.6904 6.5 12.25 5.94036 12.25 5.25V5H13.75V5.25C13.75 6.76878 12.5188 8 11 8H4C2.48122 8 1.25 6.76878 1.25 5.25ZM5 10C5 10.5523 4.55228 11 4 11 3.44772 11 3 10.5523 3 10 3 9.44772 3.44772 9 4 9 4.55228 9 5 9.44772 5 10ZM12 10C12 10.5523 11.5523 11 11 11 10.4477 11 10 10.5523 10 10 10 9.44772 10.4477 9 11 9 11.5523 9 12 9.44772 12 10Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@1x.png
deleted file mode 100644
index 4182f1a9a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@2x.png
deleted file mode 100644
index 991259226..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@3x.png
deleted file mode 100644
index b7ed8157d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/skateboard.imageset/skateboard@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/Contents.json
index 31b10465c..425764533 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"skiing@1x.png","idiom":"universal","scale":"1x"},{"filename":"skiing@2x.png","idiom":"universal","scale":"2x"},{"filename":"skiing@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"skiing.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing.svg
new file mode 100644
index 000000000..d49766b1c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="skiing" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M15,4.5C15,5.3284,14.3284,6,13.5,6S12,5.3284,12,4.5S12.6716,3,13.5,3S15,3.6716,15,4.5z M13.72,11.89&#xA;&#x9;c-0.0623-0.1197-0.2083-0.1684-0.33-0.11c-0.6846,0.4194-1.5208,0.5111-2.28,0.25L4.78,8.86L7.5,7.5v-3L9,5.25v3L10.5,9L12,8.25&#xA;&#x9;L10.5,7.5V3l-3-1.5L6,2.25v4.5L3.28,8.11L0.61,6.78C0.4857,6.7192,0.3358,6.7707,0.275,6.895C0.2142,7.0193,0.2657,7.1692,0.39,7.23&#xA;&#x9;l10.5,5.25c0.3156,0.135,0.6568,0.1998,1,0.19c0.5998-0.0103,1.1889-0.161,1.72-0.44c0.1236-0.0615,0.174-0.2116,0.1125-0.3352&#xA;&#x9;C13.7217,11.8932,13.7208,11.8916,13.72,11.89z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@1x.png
deleted file mode 100644
index fc137adfe..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@2x.png
deleted file mode 100644
index b2637384b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@3x.png
deleted file mode 100644
index a28588bc7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/skiing.imageset/skiing@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/Contents.json
index 410bfd401..598fb0462 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"slaughterhouse@1x.png","idiom":"universal","scale":"1x"},{"filename":"slaughterhouse@2x.png","idiom":"universal","scale":"2x"},{"filename":"slaughterhouse@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"slaughterhouse.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse.svg
new file mode 100644
index 000000000..5dd5b1693
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="slaughterhouse">
+  <path d="M15 6.1c0 1.376-1.363.694-1.363.694L12.5 7H11a5.31 5.31 0 0 1-1.5 2 3.272 3.272 0 0 1-.523 1.125c-.077.091-.06.2-.068.33l.091 2.3a.264.264 0 0 1-.266.25.242.242 0 0 1-.234-.205L8 9.5H4v3.253a.247.247 0 0 1-.247.247.25.25 0 0 1-.24-.2L3 10v-.5a8.2 8.2 0 0 1-1.426-.1A1.886 1.886 0 0 1 .9 10.826c-.128.083-.148.211-.133.386l.19 1.538a.25.25 0 0 1-.25.25.238.238 0 0 1-.23-.174l-.427-1.7a.35.35 0 0 1 .055-.3c.437-.68-.049-2.55-.049-2.55A1.354 1.354 0 0 1 0 7.922V5.5a2.027 2.027 0 0 1 2.736-1.914s.1.03.142.049a15.15 15.15 0 0 0 3.814.038l.18-.062a1.842 1.842 0 0 1 1.26 0c.078.02.154.05.226.089.1.049.196.106.287.171A1.8 1.8 0 0 0 9.5 4h1V3l.5.5c.5-1.5 2.5-1 2.5-1a1.687 1.687 0 0 0-1.5 1l2.5 2a.612.612 0 0 1 .186-.069.318.318 0 0 1 .314.321V6.1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@1x.png
deleted file mode 100644
index 1f48903d6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@2x.png
deleted file mode 100644
index db1b70216..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@3x.png
deleted file mode 100644
index d4d9191a7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/slaughterhouse.imageset/slaughterhouse@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/Contents.json
index 87acb4a21..e0e4e1eb6 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"slipway@1x.png","idiom":"universal","scale":"1x"},{"filename":"slipway@2x.png","idiom":"universal","scale":"2x"},{"filename":"slipway@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"slipway.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway.svg
new file mode 100644
index 000000000..a2a81bb5a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="slipway">
+  <path d="m2 10 12 1.495V12H2v-2Zm12-4-1 1v.583L5.196 4.332l.063-.125L6.61 2.845h.831a.35.35 0 0 0 0-.7h-.976a.352.352 0 0 0-.248.103L4.723 3.753a.371.371 0 0 0-.066.09l-.109.219L2 3c0 2-.03 3.958 2.86 4.5C6.28 7.765 13 9 13 9l2-2-1-1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@1x.png
deleted file mode 100644
index a0ca23466..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@2x.png
deleted file mode 100644
index b96d3831e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@3x.png
deleted file mode 100644
index 3e39c96c8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/slipway.imageset/slipway@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/Contents.json
index 047b5b4d7..26012dc6a 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"snowmobile@1x.png","idiom":"universal","scale":"1x"},{"filename":"snowmobile@2x.png","idiom":"universal","scale":"2x"},{"filename":"snowmobile@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"snowmobile.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile.svg
new file mode 100644
index 000000000..fe68b7e30
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="snowmobile">
+  <path d="M15 10a1 1 0 0 1-1 1H9.414a1 1 0 0 1-.707-.293L7.146 9.146A.499.499 0 0 0 6.793 9H3.334a1 1 0 0 1-.601-.2L1.386 7.788A1.013 1.013 0 0 1 1 7a.995.995 0 0 1 .472-.844L5 4l1.038-1.692A.5.5 0 0 1 7 2.5V6l1 1h1l5.412-.992a.5.5 0 0 1 .355.915L13 8l1.631 1.224A.99.99 0 0 1 15 10Zm-9.5 0H3.225c-.504 0-.999-.127-1.44-.368L.74 9.062a.5.5 0 0 0-.48.877l1.269.693c.441.242.937.368 1.44.368H5.5a.5.5 0 0 0 0-1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@1x.png
deleted file mode 100644
index 7694507bc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@2x.png
deleted file mode 100644
index 2ace4b5c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@3x.png
deleted file mode 100644
index 83499ff45..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/snowmobile.imageset/snowmobile@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/Contents.json
index bbc9ff480..bd5b999d3 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"soccer@1x.png","idiom":"universal","scale":"1x"},{"filename":"soccer@2x.png","idiom":"universal","scale":"2x"},{"filename":"soccer@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"soccer.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer.svg
new file mode 100644
index 000000000..e127a1509
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="soccer" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M11,1.5C11,2.3284,10.3284,3,9.5,3S8,2.3284,8,1.5S8.6716,0,9.5,0S11,0.6716,11,1.5z M11,11c-0.5523,0-1,0.4477-1,1&#xA;&#x9;s0.4477,1,1,1s1-0.4477,1-1S11.5523,11,11,11z M12.84,6.09l-1.91-1.91l0,0C10.8399,4.0675,10.7041,4.0014,10.56,4H3.5&#xA;&#x9;C3.2239,4,3,4.2239,3,4.5S3.2239,5,3.5,5h2.7L3,11.3l0,0c-0.0138,0.066-0.0138,0.134,0,0.2c-0.058,0.2761,0.1189,0.547,0.395,0.605&#xA;&#x9;C3.6711,12.163,3.942,11.9861,4,11.71l0,0L5,10h2l-1.93,4.24l0,0C5.0228,14.3184,4.9986,14.4085,5,14.5&#xA;&#x9;c-0.0552,0.2761,0.1239,0.5448,0.4,0.6c0.2761,0.0552,0.5448-0.1239,0.6-0.4l0,0l4.7-9.38l1.44,1.48&#xA;&#x9;c0.211,0.1782,0.5264,0.1516,0.7046-0.0593C13.0037,6.5523,13.0018,6.2761,12.84,6.09z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@1x.png
deleted file mode 100644
index 36bc17a9d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@2x.png
deleted file mode 100644
index 2795138e9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@3x.png
deleted file mode 100644
index 6747c4aa9..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/soccer.imageset/soccer@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/Contents.json
index b21584ac6..aa054cb63 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"square-stroked@1x.png","idiom":"universal","scale":"1x"},{"filename":"square-stroked@2x.png","idiom":"universal","scale":"2x"},{"filename":"square-stroked@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"square-stroked.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked.svg
new file mode 100644
index 000000000..157fa52f9
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="square-stroked">
+  <path d="M11.7 3.3V11.7H3.3V3.3H11.7ZM12 2H3C2.4477 2 2 2.4477 2 3V12C2 12.5523 2.4477 13 3 13H12C12.5523 13 13 12.5523 13 12V3C13 2.4477 12.5523 2 12 2Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@1x.png
deleted file mode 100644
index 96eac1429..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@2x.png
deleted file mode 100644
index c99406418..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@3x.png
deleted file mode 100644
index 634a9b997..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/square-stroked.imageset/square-stroked@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/Contents.json
index 5819326ed..8f20d5500 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"square@1x.png","idiom":"universal","scale":"1x"},{"filename":"square@2x.png","idiom":"universal","scale":"2x"},{"filename":"square@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"square.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square.svg
new file mode 100644
index 000000000..a712869e0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="square">
+  <path d="M12 13H3C2.4477 13 2 12.5523 2 12V3C2 2.4477 2.4477 2 3 2H12C12.5523 2 13 2.4477 13 3V12C13 12.5523 12.5523 13 12 13Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@1x.png
deleted file mode 100644
index 8a519322a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@2x.png
deleted file mode 100644
index df7cbf79e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@3x.png
deleted file mode 100644
index 744188f0f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/square.imageset/square@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/Contents.json
index 1f007d630..43793e41d 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"stadium@1x.png","idiom":"universal","scale":"1x"},{"filename":"stadium@2x.png","idiom":"universal","scale":"2x"},{"filename":"stadium@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"stadium.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium.svg
new file mode 100644
index 000000000..cbcc6167d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="stadium" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path4177" d="M7,1v2v1.5v0.5098C4.1695,5.1037,2.0021,5.9665,2,7v4.5c0,1.1046,2.4624,2,5.5,2s5.5-0.8954,5.5-2V7&#xA;&#x9;c-0.0021-1.0335-2.1695-1.8963-5-1.9902V4.0625L11,2.75L7,1z M3,8.1465c0.5148,0.2671,1.2014,0.4843,2,0.6328v2.9668&#xA;&#x9;C3.7948,11.477,3,11.0199,3,10.5V8.1465z M12,8.1484V10.5c0,0.5199-0.7948,0.977-2,1.2461V8.7812&#xA;&#x9;C10.7986,8.6328,11.4852,8.4155,12,8.1484z M6,8.9219C6.4877,8.973,6.9925,8.9992,7.5,9C8.0073,8.9999,8.5121,8.9743,9,8.9238&#xA;&#x9;v2.9844C8.5287,11.964,8.0288,12,7.5,12S6.4713,11.964,6,11.9082V8.9219z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@1x.png
deleted file mode 100644
index 731709722..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@2x.png
deleted file mode 100644
index 680aedb68..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@3x.png
deleted file mode 100644
index 62023ef70..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/stadium.imageset/stadium@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/Contents.json
index 3e8efd28b..bd5f91e30 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"star-stroked@1x.png","idiom":"universal","scale":"1x"},{"filename":"star-stroked@2x.png","idiom":"universal","scale":"2x"},{"filename":"star-stroked@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"star-stroked.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked.svg
new file mode 100644
index 000000000..75c5a37e0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="star-stroked">
+  <path d="m7.5 2.69 1.07 2.68.25.63h3l-2 1.75-.5.44.23.63 1 3.13-2.48-1.77-.57-.4-.57.4-2.52 1.77 1-3.13.21-.63-.5-.44-2-1.75h3l.25-.63zm0-2.69-2 5h-5l4 3.5-2 6 5-3.5 5 3.5-2-6 4-3.5h-5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@1x.png
deleted file mode 100644
index 5dfabcf43..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@2x.png
deleted file mode 100644
index e0dd30883..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@3x.png
deleted file mode 100644
index d2be6bea0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/star-stroked.imageset/star-stroked@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/Contents.json
index 39db5575a..5f791215f 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"star@1x.png","idiom":"universal","scale":"1x"},{"filename":"star@2x.png","idiom":"universal","scale":"2x"},{"filename":"star@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"star.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star.svg
new file mode 100644
index 000000000..2b6f51694
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="star" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path4749-2-8-2" d="M7.5,0l-2,5h-5l4,3.5l-2,6l5-3.5&#xA;&#x9;l5,3.5l-2-6l4-3.5h-5L7.5,0z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@1x.png
deleted file mode 100644
index 876af404b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@2x.png
deleted file mode 100644
index 2cc18a222..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@3x.png
deleted file mode 100644
index 78f5b081e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/star.imageset/star@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/Contents.json
index 938a1f6c5..d00b1f7b1 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"suitcase@1x.png","idiom":"universal","scale":"1x"},{"filename":"suitcase@2x.png","idiom":"universal","scale":"2x"},{"filename":"suitcase@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"suitcase.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase.svg
new file mode 100644
index 000000000..5900686bb
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="suitcase">
+  <path d="M4.5 4V2C4.5 1.44772 4.94772 1 5.5 1H9.5C10.0523 1 10.5 1.44772 10.5 2V4H12C12.5523 4 13 4.44772 13 5V11C13 11.5523 12.5523 12 12 12H3C2.44771 12 2 11.5523 2 11V5C2 4.44772 2.44772 4 3 4H4.5ZM5.5 2V4H9.5V2H5.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@1x.png
deleted file mode 100644
index 27e85f05a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@2x.png
deleted file mode 100644
index 49017092b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@3x.png
deleted file mode 100644
index 4ca1aea00..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/suitcase.imageset/suitcase@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/Contents.json
index 70812da8e..2bc2c83ff 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"swimming@1x.png","idiom":"universal","scale":"1x"},{"filename":"swimming@2x.png","idiom":"universal","scale":"2x"},{"filename":"swimming@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"swimming.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming.svg
new file mode 100644
index 000000000..e78fb7a82
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="swimming" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path16388" d="M10.1113,2C9.9989,2,9.6758,2.1465,9.6758,2.1465L6.3535,3.8262&#xA;&#x9;C5.9111,4.0024,5.7358,4.7081,6.002,5.0605l0.9707,1.4082L3.002,8.498L5,9.998l2.502-1.5l2.5,1.5l1.002-1.002l-3-4l2.5566-1.5293&#xA;&#x9;c0.5286-0.2662,0.4434-0.7045,0.4434-0.9707C10.9999,2.2861,10.6437,2,10.1113,2z M12.252,5C11.2847,5,10.5,5.7827,10.5,6.75&#xA;&#x9;s0.7847,1.752,1.752,1.752s1.75-0.7847,1.75-1.752S13.2192,5,12.252,5z M2.5,10L0,11.5V13l2.5-1.5L5,13l2.502-1.5l2.5,1.5L12,11.5&#xA;&#x9;l3,1.5v-1.5L12,10l-1.998,1.5l-2.5-1.5L5,11.5L2.5,10z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@1x.png
deleted file mode 100644
index 42395a9ff..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@2x.png
deleted file mode 100644
index a13290196..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@3x.png
deleted file mode 100644
index 1c8a14dbf..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/swimming.imageset/swimming@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/Contents.json
index 4854e4778..e8fc80dc6 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"table-tennis@1x.png","idiom":"universal","scale":"1x"},{"filename":"table-tennis@2x.png","idiom":"universal","scale":"2x"},{"filename":"table-tennis@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"table-tennis.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis.svg
new file mode 100644
index 000000000..e36c79e9e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="table-tennis" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="icon_concepts:_sports_leisure" d="M11.9676,10.2275a3.8116,3.8116,0,0,1-1.9122.9831L3.7678,4.9338A4.0283,4.0283,0,0,1,4.7725,3.0324C7.03.7745,9.98.2235,12.3781,2.6219S14.2255,7.97,11.9676,10.2275Zm-6.987,1.6093A3.8422,3.8422,0,0,1,6.149,11.278,4.5328,4.5328,0,0,1,8,11.4452L3.5456,7a4.4126,4.4126,0,0,1,.1572,1.9223,3.6639,3.6639,0,0,1-.5208,1.1159c-1.072,1.263-2.132,1.727-2.132,2.1879A1.8378,1.8378,0,0,0,2.7739,13.95C3.2348,13.95,3.6917,12.9368,4.9806,11.8368Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@1x.png
deleted file mode 100644
index f7608f046..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@2x.png
deleted file mode 100644
index c8bb59014..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@3x.png
deleted file mode 100644
index 3881cd4d4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/table-tennis.imageset/table-tennis@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/Contents.json
index 6709676f6..8214a6a5e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"teahouse@1x.png","idiom":"universal","scale":"1x"},{"filename":"teahouse@2x.png","idiom":"universal","scale":"2x"},{"filename":"teahouse@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"teahouse.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse.svg
new file mode 100644
index 000000000..60f567f9d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="teahouse">
+  <path d="M8.00002 5C8.00002 5 10 4.9 10 3.4 10 2.46598 9.17751 2.20864 8.47606 1.98917 7.95458 1.82601 7.5 1.68378 7.5 1.3 7.5.386843 8 0 8 0 8 0 7 .531581 7 1.5 7 2.21063 7.54045 2.46176 8.05947 2.70292 8.53888 2.92568 9 3.13994 9 3.7 9 4.7 8.00002 5 8.00002 5ZM11.8372 6.67447C11.3755 8.62063 10.7854 11.1073 9 12V14H6V12C4.21455 11.1073 3.62454 8.62063 3.16276 6.67447 3.10728 6.44061 3.05364 6.21455 3 6H12C11.9464 6.21453 11.8927 6.44063 11.8372 6.67447ZM6.99998 4C6.99998 5 5.49998 5 5.49998 5 5.49998 5 6.29295 4.9 6.29295 4.3 6.29295 4.02526 6.01604 3.85489 5.71852 3.67184 5.37315 3.45935 5 3.22977 5 2.8 5 1.9661 5.99998 1.5 5.99998 1.5 5.99998 1.5 5.49998 1.77344 5.49998 2.5 5.49998 2.88823 5.85322 3.04095 6.21687 3.19818 6.60257 3.36494 6.99998 3.53675 6.99998 4Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@1x.png
deleted file mode 100644
index 23fec75a3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@2x.png
deleted file mode 100644
index 46e29b2b6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@3x.png
deleted file mode 100644
index 79e547fb0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/teahouse.imageset/teahouse@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/Contents.json
index 13d9e98fc..c0bfcc80c 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"telephone@1x.png","idiom":"universal","scale":"1x"},{"filename":"telephone@2x.png","idiom":"universal","scale":"2x"},{"filename":"telephone@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"telephone.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone.svg
new file mode 100644
index 000000000..3f67f650b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="telephone">
+  <path d="M4.51,8.88a0.51,0.51,0,0,0,0,.72l0.72,0.72L3.07,12.5,2.7,12.13A2.24,2.24,0,0,1,2,10.69V9.24a2.24,2.24,0,0,1,.7-1.45L7.77,2.72A2.24,2.24,0,0,1,9.22,2h1.45a2.24,2.24,0,0,1,1.45.72l0.36,0.36L10.31,5.26,9.58,4.53a0.51,0.51,0,0,0-.72,0ZM4.13,13.6a1,1,0,0,0,1.4137.0363Q5.5623,13.6186,5.58,13.6l0.72-.72a1,1,0,0,0,.0363-1.4137Q6.3186,11.4477,6.3,11.43Zm7.25-7.28a1,1,0,0,0,1.4137.0363C12.8061,6.3445,13.55,5.6,13.55,5.6a1,1,0,0,0,.0363-1.4137Q13.5686,4.1677,13.55,4.15Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@1x.png
deleted file mode 100644
index 8bac88d1f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@2x.png
deleted file mode 100644
index 5c551232c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@3x.png
deleted file mode 100644
index c80e77fd2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/telephone.imageset/telephone@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/Contents.json
index d67f86d3d..a8f17028e 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"tennis@1x.png","idiom":"universal","scale":"1x"},{"filename":"tennis@2x.png","idiom":"universal","scale":"2x"},{"filename":"tennis@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"tennis.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis.svg
new file mode 100644
index 000000000..7bce441e7
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="tennis" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13.1284,1.87c-1.5418-1.5406-4.5535-.7759-6.28,1.05a6.8282,6.8282,0,0,0-1.88,4.4,5.7275,5.7275,0,0,1-.57,2.72.6814.6814,0,0,0-.67.17l-2.49,2.5a.6941.6941,0,0,0,0,.98l.07.07a.7051.7051,0,0,0,.98,0l2.5-2.49a.683.683,0,0,0,.18-.66,8.5694,8.5694,0,0,1,3.12-.58,6.5487,6.5487,0,0,0,3.99-1.87C14.1084,6.13,14.579,3.3194,13.1284,1.87Zm-2.2-.04a2.3071,2.3071,0,0,1,1.64.61,2.548,2.548,0,0,1,.5,2.44l-2.95-2.96A3.8648,3.8648,0,0,1,10.9284,1.83Zm-4.57,6.81a2.6485,2.6485,0,0,1-.48-2.55l3.04,3.04A2.8522,2.8522,0,0,1,6.3584,8.64Zm2.88.39-3.26-3.27a5.1623,5.1623,0,0,1,.49-1.08l3.85,3.85A5.5093,5.5093,0,0,1,9.2384,9.03Zm1.34-.66-3.94-3.95a5.2032,5.2032,0,0,1,.74-.9l4.1,4.1A5.6869,5.6869,0,0,1,10.5784,8.37Zm1.11-.96-4.1-4.1a5.5714,5.5714,0,0,1,.84-.65l3.92,3.92A5.7187,5.7187,0,0,1,11.6884,7.41Zm.82-1.09L8.6984,2.5a4.1707,4.1707,0,0,1,1.09-.48l3.2,3.2A5.5656,5.5656,0,0,1,12.5084,6.32Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@1x.png
deleted file mode 100644
index 5df9f419a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@2x.png
deleted file mode 100644
index a026da3e3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@3x.png
deleted file mode 100644
index a97445f44..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/tennis.imageset/tennis@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/terminal.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/terminal.imageset/Contents.json
new file mode 100644
index 000000000..96b233b38
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/terminal.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"terminal.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/terminal.imageset/terminal.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/terminal.imageset/terminal.svg
new file mode 100644
index 000000000..91cce36ec
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/terminal.imageset/terminal.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="terminal" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M3.29913 2.10044C3.42689 2.03656 3.57588 2.03037 3.70851 2.08345L9.63537 4.45538L13.1486 2.99828C13.8194 2.72008 14.5901 3.02189 14.8935 3.68161C15.2212 4.39398 14.8756 5.23477 14.1417 5.51075L4.70887 9.05752C3.973 9.33421 3.14328 9.15412 2.58833 8.59726L0.195519 6.1962C0.0992589 6.0996 0.12577 5.93712 0.24774 5.87613L0.754504 5.62275C0.907406 5.5463 1.08877 5.55326 1.23536 5.64122L3.5 7L6.54756 5.73604L2.74423 2.69526C2.6302 2.6041 2.6491 2.42545 2.77968 2.36016L3.29913 2.10044Z M0.5 12C0.223858 12 0 12.2239 0 12.5C0 12.7761 0.223858 13 0.5 13H14.5C14.7761 13 15 12.7761 15 12.5C15 12.2239 14.7761 12 14.5 12H0.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/Contents.json
index 8ccca47d2..12d61c4bb 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"theatre@1x.png","idiom":"universal","scale":"1x"},{"filename":"theatre@2x.png","idiom":"universal","scale":"2x"},{"filename":"theatre@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"theatre.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre.svg
new file mode 100644
index 000000000..87c976324
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="theatre" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path6342-3" d="M2,1c0,0-1,0-1,1v5.1582C1,8.8885,1.354,11,4.5,11H5V8L2.5,9c0,0,0-2.5,2.5-2.5V5&#xA;&#x9;c0-0.7078,0.0868-1.3209,0.5-1.7754C5.8815,2.805,6.5046,1.9674,8.1562,2.7539L9,3.3027V2c0,0,0-1-1-1C7.2922,1,6.0224,2,5,2&#xA;&#x9;S2.7865,1,2,1z M3,3c0.5523,0,1,0.4477,1,1S3.5523,5,3,5S2,4.5523,2,4S2.4477,3,3,3z M7,4c0,0-1,0-1,1v5c0,2,1,4,4,4s4-2,4-4V5&#xA;&#x9;c0-1-1-1-1-1c-0.7078,0-1.9776,1-3,1S7.7865,4,7,4z M8,6c0.5523,0,1,0.4477,1,1S8.5523,8,8,8S7,7.5523,7,7S7.4477,6,8,6z M12,6&#xA;&#x9;c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1s-1-0.4477-1-1S11.4477,6,12,6z M7.5,10H10h2.5c0,0,0,2.5-2.5,2.5S7.5,10,7.5,10z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@1x.png
deleted file mode 100644
index 2dd5ae64e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@2x.png
deleted file mode 100644
index cdfd9e5b4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@3x.png
deleted file mode 100644
index 69837fcc1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/theatre.imageset/theatre@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/Contents.json
index 72af8b0cd..1b0f2ddd7 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"toilet@1x.png","idiom":"universal","scale":"1x"},{"filename":"toilet@2x.png","idiom":"universal","scale":"2x"},{"filename":"toilet@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"toilet.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet.svg
new file mode 100644
index 000000000..00821ff35
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="toilet">
+  <path d="M3 1.5a1.5 1.5 0 1 0 3 0 1.5 1.5 0 0 0-3 0ZM11.5 0a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM3.29 4a1 1 0 0 0-.868.504L.566 7.752a.5.5 0 1 0 .868.496l1.412-2.472A345.048 345.048 0 0 0 1 11h2v2.5a.5.5 0 0 0 1 0V11h1v2.5a.5.5 0 0 0 1 0V11h2L6.103 5.687l1.463 2.561a.5.5 0 1 0 .868-.496L6.578 4.504A1 1 0 0 0 5.71 4H3.29ZM9 4.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v5a.5.5 0 0 1-1 0v4a.5.5 0 0 1-1 0v-4h-1v4a.5.5 0 0 1-1 0v-4a.5.5 0 0 1-1 0v-5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@1x.png
deleted file mode 100644
index 7795f9dea..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@2x.png
deleted file mode 100644
index e09d906ac..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@3x.png
deleted file mode 100644
index 929c184c3..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/toilet.imageset/toilet@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/toll.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/toll.imageset/Contents.json
new file mode 100644
index 000000000..666160beb
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/toll.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"toll.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/toll.imageset/toll.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/toll.imageset/toll.svg
new file mode 100644
index 000000000..467d1ecc8
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/toll.imageset/toll.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="toll" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M2.5 1C2.22386 1 2 1.22386 2 1.5V2V13H1.5C1.22386 13 1 13.2239 1 13.5C1 13.7761 1.22386 14 1.5 14H8.5C8.77614 14 9 13.7761 9 13.5C9 13.2239 8.77614 13 8.5 13H7V10.0987L13.7761 5.54576C14.0053 5.39175 14.0663 5.08109 13.9123 4.85189L13.6334 4.43687C13.4794 4.20766 13.1688 4.1467 12.9396 4.3007L7 8.29152V2H7.5C7.77614 2 8 1.77614 8 1.5C8 1.22386 7.77614 1 7.5 1H2.5ZM3 3.5C3 3.22386 3.22386 3 3.5 3H5.5C5.77614 3 6 3.22386 6 3.5V7.5C6 7.77614 5.77614 8 5.5 8H3.5C3.22386 8 3 7.77614 3 7.5V3.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/Contents.json
index 4a1444f31..db5913519 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"town-hall@1x.png","idiom":"universal","scale":"1x"},{"filename":"town-hall@2x.png","idiom":"universal","scale":"2x"},{"filename":"town-hall@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"town-hall.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall.svg
new file mode 100644
index 000000000..7825b1e0c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="town-hall" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13,4H9l0-3L7.5,0L6,1v3H2L1,5v1h13V5L13,4z M7.5,1.5c0.4,0,0.7,0.3,0.7,0.8S7.9,3,7.5,3S6.7,2.7,6.7,2.2&#xA;&#x9;C6.7,1.8,7.1,1.5,7.5,1.5z M13,7H2v4l-1,1.5V14h13v-1.5L13,11V7z M5,12.5H4V8h1V12.5z M8,12.5H7V8h1V12.5z M11,12.5h-1V8h1V12.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@1x.png
deleted file mode 100644
index bfa744bb1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@2x.png
deleted file mode 100644
index d9213c763..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@3x.png
deleted file mode 100644
index 37c62ba3c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/town-hall.imageset/town-hall@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/Contents.json
index ad3f30310..788a3bb19 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"town@1x.png","idiom":"universal","scale":"1x"},{"filename":"town@2x.png","idiom":"universal","scale":"2x"},{"filename":"town@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"town.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town.svg
new file mode 100644
index 000000000..145b3085c
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="town">
+  <path d="m10.651 6.121c-.0445-.0357-.0999-.05516-.157-.05516s-.1125.01946-.157.05516l-2.245 1.808c-.02881.02323-.05204.05263-.06796.08603-.01593.03341-.02414.06997-.02404.10697v4.625c0 .0671.02666.1315.0741.1789.04745.0474.1118.0741.1789.0741h1.494c.0671 0 .13145-.0267.1789-.0741s.0741-.1118.0741-.1789v-1.747h1v1.747c0 .0671.0267.1315.0741.1789.0475.0474.1118.0741.1789.0741h1.494c.0671 0 .1315-.0267.1789-.0741s.0741-.1118.0741-.1789v-4.627c.0007-.03831-.0074-.07627-.0237-.11095s-.0404-.06514-.0703-.08905zm-.651 3.879h-1v-1h1zm2 0h-1v-1h1zm-6.29-9.184997c-.02299-.034654-.05419-.063081-.09083-.082746s-.07758-.029956-.11917-.029956c-.04158 0-.08252.010291-.11916.029956-.03665.019665-.06785.048092-.09084.082746l-3.248 4.120997c-.02752.0415-.04214.09021-.042.14v7.671c-.00013.0331.00626.0659.0188.0965s.031.0585.0543.082c.02331.0235.05102.0422.08154.0549.03053.0128.06327.0195.09636.0196h2.5c.06632-.0008.12964-.0277.17626-.0749.04661-.0471.07275-.1108.07274-.1771v-1.748h1v1.748c0 .0668.02655.1309.07381.1782s.11136.0738.17819.0738h.748v-6c-.00004-.07511.01684-.14926.04938-.21695.03255-.06769.07993-.12718.13862-.17405l1.812-1.609c0-.05-3.29-4.184997-3.29-4.184997zm-1.71 8.184997h-1v-1h1zm0-3h-1v-1h1zm2 3h-1v-1h1zm0-3h-1v-1h1z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@1x.png
deleted file mode 100644
index 99bd14a84..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@2x.png
deleted file mode 100644
index 562738285..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@3x.png
deleted file mode 100644
index c1dacbfca..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/town.imageset/town@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/Contents.json
index 72713856e..af933395f 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"triangle-stroked@1x.png","idiom":"universal","scale":"1x"},{"filename":"triangle-stroked@2x.png","idiom":"universal","scale":"2x"},{"filename":"triangle-stroked@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"triangle-stroked.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked.svg
new file mode 100644
index 000000000..46db93f8d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="triangle-stroked">
+  <path d="m7.52427.500405c-.2814-.0091-.5456.1419-.6907.3948l-5.5 9.869195c-.3118.5434.0614 1.2355.6664 1.2356h11.00003c.605-.0001.9782-.6922.6664-1.2355l-5.50003-9.869195c-.1362-.2374-.378-.3861-.6421-.3949zm-.0243 2.398895 4.12673 7.4704h-8.25343z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@1x.png
deleted file mode 100644
index ec571f9a8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@2x.png
deleted file mode 100644
index f864ebc69..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@3x.png
deleted file mode 100644
index a0485fb4e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle-stroked.imageset/triangle-stroked@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/Contents.json
index 80802ce1c..d351c14b7 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"triangle@1x.png","idiom":"universal","scale":"1x"},{"filename":"triangle@2x.png","idiom":"universal","scale":"2x"},{"filename":"triangle@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"triangle.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle.svg
new file mode 100644
index 000000000..0e5f97184
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg" id="triangle">
+  <path d="m7.5385 1c-.2948 0-.4883.1772-.6154.3846l-5.8462 9.5385c-.0769.0769-.0769.2307-.0769.3846 0 .5385.3846.6923.6923.6923h11.6154c.3846 0 .6923-.1538.6923-.6923 0-.1538 0-.2308-.0769-.3846l-5.7693-9.5385c-.1258-.2081-.3656-.3846-.6153-.3846z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@1x.png
deleted file mode 100644
index 5797439ac..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@2x.png
deleted file mode 100644
index b5b552a02..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@3x.png
deleted file mode 100644
index a1343f95b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/triangle.imageset/triangle@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/tunnel.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/tunnel.imageset/Contents.json
new file mode 100644
index 000000000..d68ade63d
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/tunnel.imageset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"filename":"tunnel.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/tunnel.imageset/tunnel.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/tunnel.imageset/tunnel.svg
new file mode 100644
index 000000000..d7619728e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/tunnel.imageset/tunnel.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="tunnel">
+  <path d="M4 2C2.34315 2 1 3.32706 1 4.96406V12.012C1 12.5576 1.44772 13 2 13H3V8.55391C3 6.09839 5.01472 4.10781 7.5 4.10781C9.98528 4.10781 12 6.09842 12 8.55393V13H13C13.5523 13 14 12.5576 14 12.012V4.96406C14 3.32706 12.6569 2 11 2H4ZM11 10V9.04794C11 6.86526 9.43299 5.09583 7.5 5.09583C5.56701 5.09583 4.00001 6.86526 4 9.04794V13L11 10Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/Contents.json
index a5571ef55..c525e75ed 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"veterinary@1x.png","idiom":"universal","scale":"1x"},{"filename":"veterinary@2x.png","idiom":"universal","scale":"2x"},{"filename":"veterinary@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"veterinary.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary.svg
new file mode 100644
index 000000000..f0f33d9af
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="veterinary">
+  <path d="M7.5,6c-2.5,0-3,2.28-3,3.47h0a6.149,6.149,0,0,0-1.7.89,2,2,0,0,0-.4,2.78,2.06,2.06,0,0,0,2.8.4,4,4,0,0,1,2.3-.69,4,4,0,0,1,2.3.69,2,2,0,0,0,2.8-.3,1.929,1.929,0,0,0-.226-2.72c-.024-.021-.049-.041-.074-.06l-.1-.1a8.992,8.992,0,0,0-1.7-.89h0C10.5,8.29,10,6,7.5,6ZM2.08,4.3a1.58,1.58,0,0,0-.76,2A1.52,1.52,0,0,0,2.93,7.7a1.58,1.58,0,0,0,.76-2A1.52,1.52,0,0,0,2.08,4.3Zm10.85,0a1.58,1.58,0,0,1,.76,2,1.52,1.52,0,0,1-1.61,1.4,1.58,1.58,0,0,1-.76-2A1.52,1.52,0,0,1,12.93,4.3Zm-7.85-3c-.68.09-1,.94-.76,1.87A1.77,1.77,0,0,0,5.93,4.7c.68-.09,1-.94.76-1.87A1.77,1.77,0,0,0,5.08,1.3Zm4.85,0c.68.09,1,.94.76,1.87A1.77,1.77,0,0,1,9.07,4.7c-.68-.08-1-.94-.76-1.87A1.769,1.769,0,0,1,9.93,1.3Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@1x.png
deleted file mode 100644
index 84bb7e6b4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@2x.png
deleted file mode 100644
index a170be829..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@3x.png
deleted file mode 100644
index b249254fe..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/veterinary.imageset/veterinary@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/Contents.json
index f4058f23d..83884d193 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"viewpoint@1x.png","idiom":"universal","scale":"1x"},{"filename":"viewpoint@2x.png","idiom":"universal","scale":"2x"},{"filename":"viewpoint@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"viewpoint.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint.svg
new file mode 100644
index 000000000..13f8339c0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="viewpoint" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="cf3b542b-d2af-4732-9b92-9e3dc05e460f" d="M6.02,8.425a2.3859,2.3859,0,0,0-.46.44l-4.55-3.5a7.9976,7.9976,0,0,1,1.51-1.51Zm6.46-4.56-3.5,4.55a2.3971,2.3971,0,0,1,.45.45l4.56-3.5A7.945,7.945,0,0,0,12.48,3.865ZM7.3042,10.0129a1.5,1.5,0,1,0,1.6829,1.2914h0A1.5,1.5,0,0,0,7.3042,10.0129ZM6.43,2.235a7.9329,7.9329,0,0,0-2.06.55l2.2,5.32a2.0438,2.0438,0,0,1,.61-.17Zm2.14.01-.75,5.69a2.49,2.49,0,0,1,.61.16l2.2-5.3A7.2129,7.2129,0,0,0,8.57,2.245Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@1x.png
deleted file mode 100644
index 5b0b80894..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@2x.png
deleted file mode 100644
index 4a01346c2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@3x.png
deleted file mode 100644
index ebcfc4d6e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/viewpoint.imageset/viewpoint@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/Contents.json
index 524c601ed..790da4516 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"village@1x.png","idiom":"universal","scale":"1x"},{"filename":"village@2x.png","idiom":"universal","scale":"2x"},{"filename":"village@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"village.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village.svg
new file mode 100644
index 000000000..8da18e4e0
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="village">
+  <path d="M6.176 1.176a.249.249 0 0 0-.352 0l-4.4 4.4A.25.25 0 0 0 1.6 6H3v6.751a.25.25 0 0 0 .249.249h3.5A.248.248 0 0 0 7 12.753v-7.43c0-.066.026-.13.073-.176L8.5 3.5 6.176 1.176ZM6 11H5v-1h1v1Zm0-2H5V8h1v1Zm0-3v1H5V6h1Z M12.75 3h-.5a.25.25 0 0 0-.25.25V5l-1.324-1.824a.249.249 0 0 0-.352 0L8.056 5.932A.246.246 0 0 0 8 6.088v6.66a.249.249 0 0 0 .246.252h1.5a.253.253 0 0 0 .254-.252V11h1v1.747a.253.253 0 0 0 .253.253h1.5a.25.25 0 0 0 .247-.249V3.25a.25.25 0 0 0-.25-.25ZM10 8H9V7h1v1Zm2 0h-1V7h1v1Zm-2 2H9V9h1v1Zm2 0h-1V9h1v1Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@1x.png
deleted file mode 100644
index aeac92837..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@2x.png
deleted file mode 100644
index d55e7caf8..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@3x.png
deleted file mode 100644
index ca370a7dc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/village.imageset/village@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/Contents.json
index 807623472..4c34255ca 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"volcano@1x.png","idiom":"universal","scale":"1x"},{"filename":"volcano@2x.png","idiom":"universal","scale":"2x"},{"filename":"volcano@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"volcano.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano.svg
new file mode 100644
index 000000000..5c5b54235
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="volcano" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path6447" d="M8.4844,1.0002&#xA;&#x9;c-0.1464,0.005-0.2835,0.0731-0.375,0.1875L6.4492,3.2619L4.8438,1.7385C4.4079,1.3374,3.7599,1.893,4.0899,2.385l1.666,2.4004&#xA;&#x9;C5.9472,5.061,6.3503,5.0737,6.5586,4.8108C6.7249,4.6009,7,4.133,7.5,4.133s0.7929,0.4907,0.9414,0.6777&#xA;&#x9;c0.175,0.2204,0.4973,0.2531,0.7129,0.0723l1.668-1.4004c0.4408-0.3741,0.0006-1.0735-0.5273-0.8379L9,3.2268V1.5002&#xA;&#x9;C9.0002,1.2179,8.7666,0.9915,8.4844,1.0002L8.4844,1.0002z M5,6.0002L2.0762,11.924C1.9993,12.0009,2,12.155,2,12.3088&#xA;&#x9;c0,0.5385,0.3837,0.6914,0.6914,0.6914h9.6172c0.3846,0,0.6914-0.153,0.6914-0.6914c0-0.1538,0.0008-0.2309-0.0762-0.3848L10,6.0002&#xA;&#x9;c-0.5,0-1,0.5-1,1v0.5c0,0.277-0.223,0.5-0.5,0.5S8,7.7772,8,7.5002v-0.5c0-0.2761-0.2238-0.5-0.5-0.5S7,6.7241,7,7.0002v2&#xA;&#x9;c0,0.277-0.223,0.5-0.5,0.5S6,9.2772,6,9.0002v-2C6,6.5002,5.5,6.0002,5,6.0002z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@1x.png
deleted file mode 100644
index cb73760c4..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@2x.png
deleted file mode 100644
index a57a42724..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@3x.png
deleted file mode 100644
index 5f9a56ac2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/volcano.imageset/volcano@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/Contents.json
index e31b7ed55..3c2213da5 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"volleyball@1x.png","idiom":"universal","scale":"1x"},{"filename":"volleyball@2x.png","idiom":"universal","scale":"2x"},{"filename":"volleyball@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"volleyball.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball.svg
new file mode 100644
index 000000000..d08aff39b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="volleyball" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="e086ca83-8703-4df5-a97c-5939eb32113a" d="M13.91,7.94a5.9086,5.9086,0,0,1-.13.94,8.8218,8.8218,0,0,0-2.17-1.49,8.89,8.89,0,0,0-1.4-.56,8.6142,8.6142,0,0,0-1.82-.35.221.221,0,0,0-.08-.01A7.32,7.32,0,0,1,7.5,4.59c-.01-.01-.01-.01,0-.02a7.7573,7.7573,0,0,1,1.52.15,7.0987,7.0987,0,0,1,1.56.5,6.8585,6.8585,0,0,1,1.4.78A7.4165,7.4165,0,0,1,13.91,7.94Zm-1.87-5a6.2232,6.2232,0,0,0-1.85-1.27,4.2725,4.2725,0,0,0-.98-.36,5.6412,5.6412,0,0,0-1.55-.23,1.2882,1.2882,0,0,0-.32,0A7.4263,7.4263,0,0,0,7.21,2.5c0,.2.01.39.02.58a2.28,2.28,0,0,1,.26-.01,2.6438,2.6438,0,0,1,.28.01,8.2865,8.2865,0,0,1,1.49.16,8.9879,8.9879,0,0,1,1.35.37,8.7922,8.7922,0,0,1,1.53.7,10.18,10.18,0,0,1,1.39.97A6.4588,6.4588,0,0,0,12.04,2.94ZM4.01,8.76a9.4084,9.4084,0,0,1-.62-1.37,9.1038,9.1038,0,0,1-.37-1.41,9.1748,9.1748,0,0,1-.16-1.67V4.28a8.455,8.455,0,0,1,.1-1.34A6.28,6.28,0,0,0,1.47,5.3a6.2222,6.2222,0,0,0-.4,2.2c0,.15.01.3.02.44a5.9086,5.9086,0,0,0,.13.94,5.7343,5.7343,0,0,0,.41,1.23c.22-.05.44-.11.65-.17a8.0188,8.0188,0,0,0,1.9-.88C4.12,8.96,4.06,8.86,4.01,8.76Zm2.6-2.28a9,9,0,0,1-.63-1.76,9.135,9.135,0,0,1-.24-1.48c-.02-.25-.03-.49-.03-.74a9.3777,9.3777,0,0,1,.08-1.19,4.2725,4.2725,0,0,0-.98.36,7.7038,7.7038,0,0,0-.42,1.94c-.02.22-.03.44-.03.67a7.2659,7.2659,0,0,0,.06.93,7.4258,7.4258,0,0,0,.37,1.63,6.4705,6.4705,0,0,0,.59,1.28A8.0174,8.0174,0,0,0,6.65,6.55.2522.2522,0,0,1,6.61,6.48ZM12.7,9.93s0-.01-.01,0a7.0128,7.0128,0,0,0-1.7-1.16c-.06.1-.11.19-.17.29a8.783,8.783,0,0,1-.88,1.22,8.9125,8.9125,0,0,1-1.06,1.07,10.4181,10.4181,0,0,1-1.38.98,8.9933,8.9933,0,0,1-2.64,1.02,6.2985,6.2985,0,0,0,5.28,0,5.9674,5.9674,0,0,0,2.42-1.89,4.8258,4.8258,0,0,0,.65-1.03A6.0315,6.0315,0,0,0,12.7,9.93Zm-5.17-2c-.01.01-.02.03-.03.04a9.26,9.26,0,0,1-1.25,1.4,9.5925,9.5925,0,0,1-1.19.91,9.2683,9.2683,0,0,1-2.62,1.18,6.0989,6.0989,0,0,0,.53.61,7.7353,7.7353,0,0,0,3.15-.72,7.3839,7.3839,0,0,0,1.38-.82A7.6429,7.6429,0,0,0,8.75,9.37a7.7441,7.7441,0,0,0,.82-1.15A7.3414,7.3414,0,0,0,7.53,7.93Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@1x.png
deleted file mode 100644
index 7abb4f090..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@2x.png
deleted file mode 100644
index 40a836ab7..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@3x.png
deleted file mode 100644
index 681dd6aca..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/volleyball.imageset/volleyball@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/Contents.json
index 54994a21c..f2d80a885 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"warehouse@1x.png","idiom":"universal","scale":"1x"},{"filename":"warehouse@2x.png","idiom":"universal","scale":"2x"},{"filename":"warehouse@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"warehouse.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse.svg
new file mode 100644
index 000000000..165fce66f
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="warehouse" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M13.5,5c-0.0762,0.0003-0.1514-0.0168-0.22-0.05L7.5,2L1.72,4.93C1.4632,5.0515,1.1565,4.9418,1.035,4.685&#xA;&#x9;S1.0232,4.1215,1.28,4L7.5,0.92L13.72,4c0.2761,0.0608,0.4508,0.3339,0.39,0.61C14.0492,4.8861,13.7761,5.0608,13.5,5z M5,10H2v3h3&#xA;&#x9;V10z M9,10H6v3h3V10z M13,10h-3v3h3V10z M11,6H8v3h3V6z M7,6H4v3h3V6z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@1x.png
deleted file mode 100644
index 6a7c7d20e..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@2x.png
deleted file mode 100644
index 92755d2c1..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@3x.png
deleted file mode 100644
index 3595dba1a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/warehouse.imageset/warehouse@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/Contents.json
index a2c735a7a..4902cc200 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"waste-basket@1x.png","idiom":"universal","scale":"1x"},{"filename":"waste-basket@2x.png","idiom":"universal","scale":"2x"},{"filename":"waste-basket@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"waste-basket.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket.svg
new file mode 100644
index 000000000..d61cd573a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="waste-basket" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12.41,5.58l-1.34,8c-0.0433,0.2368-0.2493,0.4091-0.49,0.41H4.42c-0.2407-0.0009-0.4467-0.1732-0.49-0.41l-1.34-8&#xA;&#x9;C2.5458,5.3074,2.731,5.0506,3.0035,5.0064C3.0288,5.0023,3.0544,5.0002,3.08,5h8.83c0.2761-0.0036,0.5028,0.2174,0.5064,0.4935&#xA;&#x9;C12.4168,5.5225,12.4146,5.5514,12.41,5.58z M13,3.5C13,3.7761,12.7761,4,12.5,4h-10C2.2239,4,2,3.7761,2,3.5S2.2239,3,2.5,3H5V1.5&#xA;&#x9;C5,1.2239,5.2239,1,5.5,1h4C9.7761,1,10,1.2239,10,1.5V3h2.5C12.7761,3,13,3.2239,13,3.5z M9,3V2H6v1H9z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@1x.png
deleted file mode 100644
index 24adf0a03..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@2x.png
deleted file mode 100644
index 839602e44..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@3x.png
deleted file mode 100644
index c5b6f7939..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/waste-basket.imageset/waste-basket@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/Contents.json
index b69467cab..fcb3487b4 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"watch@1x.png","idiom":"universal","scale":"1x"},{"filename":"watch@2x.png","idiom":"universal","scale":"2x"},{"filename":"watch@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"watch.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch.svg
new file mode 100644
index 000000000..3600f982b
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="watch">
+  <path d="M12.5,7H12a.426.426,0,0,0-.049.01A4.484,4.484,0,0,0,10,3.76V1.5A.5.5,0,0,0,9.5,1h-4a.5.5,0,0,0-.5.5V3.76a4.5,4.5,0,0,0,0,7.48V13.5a.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5V11.24a4.486,4.486,0,0,0,1.951-3.25A.426.426,0,0,0,12,8h.5a.5.5,0,0,0,0-1Zm-5,4A3.5,3.5,0,1,1,11,7.5,3.5,3.5,0,0,1,7.5,11ZM9,7H8V5.5a.5.5,0,0,0-1,0v2a.5.5,0,0,0,.5.5H9A.5.5,0,0,0,9,7Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@1x.png
deleted file mode 100644
index 4d70fdd26..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@2x.png
deleted file mode 100644
index 2c4488405..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@3x.png
deleted file mode 100644
index 8c51d3940..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/watch.imageset/watch@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/Contents.json
index f1f68c59a..05e314002 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"water@1x.png","idiom":"universal","scale":"1x"},{"filename":"water@2x.png","idiom":"universal","scale":"2x"},{"filename":"water@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"water.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water.svg
new file mode 100644
index 000000000..8fca8934a
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="water">
+  <path d="M7.5 14C9.57688 14 12 12.7117 12 9.43241C12 7.20724 8.53844 2.2883 7.5 1C6.57691 2.2883 3 7.09007 3 9.43241C3 12.7117 5.42312 14 7.5 14Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@1x.png
deleted file mode 100644
index f835ed961..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@2x.png
deleted file mode 100644
index f603282bc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@3x.png
deleted file mode 100644
index fa66d8c0c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/water.imageset/water@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/Contents.json
index 391a2d15a..88985f2e0 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"waterfall@1x.png","idiom":"universal","scale":"1x"},{"filename":"waterfall@2x.png","idiom":"universal","scale":"2x"},{"filename":"waterfall@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"waterfall.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall.svg
new file mode 100644
index 000000000..55b199247
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" id="waterfall">
+  <path d="M14 1H5C3.34315 1 2 2.34314 2 4V8.87918C1.39704 9.28261 1 9.96937 1 10.75C1 11.9927 2.00736 13 3.25 13C3.7127 13 4.14279 12.8599 4.5 12.6209C4.85721 12.8599 5.2873 13 5.75 13C6.28601 13 6.77826 12.812 7.16413 12.5H7.51743C8.01909 12.8165 8.61403 13 9.25 13C11.0449 13 12.5 11.5449 12.5 9.75002C12.5 8.39777 11.6747 7.23919 10.5 6.74934V5C10.5 3.89543 11.3954 3 12.5 3H14V1ZM11.5 9.75C11.5 10.9926 10.4926 12 9.25 12C8.71418 12 8.2221 11.8127 7.83567 11.5H6.75009C6.52204 11.8036 6.15895 12 5.75 12C5.34105 12 4.97796 11.8036 4.74991 11.5H4.25009C4.02204 11.8036 3.65895 12 3.25 12C2.55964 12 2 11.4404 2 10.75C2 10.1453 2.42944 9.64082 3 9.525V5.75C3 5.33579 3.33579 5 3.75 5C4.16421 5 4.5 5.33579 4.5 5.75V9C4.5 9.27614 4.72386 9.5 5 9.5C5.27614 9.5 5.5 9.27614 5.5 9V6.75C5.5 6.33579 5.83579 6 6.25 6C6.66421 6 7 6.33579 7 6.75V9C7 9.27614 7.22386 9.5 7.5 9.5C7.77614 9.5 8 9.27614 8 9V5.75C8 5.33579 8.33579 5 8.75 5C9.16421 5 9.5 5.33579 9.5 5.75V7.51373C10.625 7.63809 11.5 8.59186 11.5 9.75Z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@1x.png
deleted file mode 100644
index cf366c82c..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@2x.png
deleted file mode 100644
index 8cb70dc47..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@3x.png
deleted file mode 100644
index b1f03e05f..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/waterfall.imageset/waterfall@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/Contents.json
index 9e48c6d57..a015604fc 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"watermill@1x.png","idiom":"universal","scale":"1x"},{"filename":"watermill@2x.png","idiom":"universal","scale":"2x"},{"filename":"watermill@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"watermill.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill.svg
new file mode 100644
index 000000000..ef9fc99aa
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="watermill" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M2,10.2L4,9l2.5,1.5l1.4659-0.8788C7.6592,9.4698,7.3716,9.285,7.1231,9.0536l1.4131-1.4131&#xA;&#x9;C8.7672,7.836,9.0557,7.9606,9.375,7.9874V9.224l0.25,0.1501V7.9874c0.3193-0.0268,0.6078-0.1514,0.8388-0.3469l1.4131,1.4131&#xA;&#x9;c-0.4059,0.3781-0.9044,0.6492-1.4528,0.8003L11.5,10.5l0.6984-0.4191C13.2863,9.2595,14,7.9682,14,6.5C14,4.0147,11.9853,2,9.5,2&#xA;&#x9;C8.1917,2,7.0241,2.5674,6.2018,3.4587L4.5,2L1,5h1V10.2z M12.0536,8.8769l-1.4131-1.4131c0.1954-0.231,0.3201-0.5196,0.3469-0.8388&#xA;&#x9;h1.9999C12.956,7.4946,12.6089,8.2806,12.0536,8.8769z M12.9874,6.375h-1.9999c-0.0268-0.3193-0.1514-0.6078-0.3469-0.8388&#xA;&#x9;l1.4131-1.4131C12.6089,4.7193,12.956,5.5054,12.9874,6.375z M9.625,3.0126c0.8696,0.0314,1.6557,0.3784,2.2519,0.9337&#xA;&#x9;l-1.4131,1.4131c-0.231-0.1954-0.5196-0.32-0.8388-0.3468C9.625,5.0126,9.625,3.0126,9.625,3.0126z M9.375,3.0126v1.9999&#xA;&#x9;C9.0558,5.0394,8.7672,5.164,8.5362,5.3594L7.1231,3.9463C7.7193,3.3911,8.5054,3.044,9.375,3.0126z M6.9464,4.1231l1.4131,1.4131&#xA;&#x9;C8.164,5.7672,8.0394,6.0557,8.0126,6.375h-2C6.044,5.5054,6.3911,4.7193,6.9464,4.1231z M8.0126,6.625&#xA;&#x9;c0.0268,0.3192,0.1515,0.6078,0.3469,0.8388L6.9464,8.8769C6.3911,8.2807,6.044,7.4946,6.0126,6.625H8.0126z M9.002,10L6.5,11.5&#xA;&#x9;L4,10l-2.5,1.5V13L4,11.5L6.5,13l2.502-1.5L11.5,13l2.5-1.5V10l-2.5,1.5L9.002,10z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@1x.png
deleted file mode 100644
index 506a5417a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@2x.png
deleted file mode 100644
index cb4534ff2..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@3x.png
deleted file mode 100644
index dcf326da0..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/watermill.imageset/watermill@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/Contents.json
index f388f6a71..2317ae1cd 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"wetland@1x.png","idiom":"universal","scale":"1x"},{"filename":"wetland@2x.png","idiom":"universal","scale":"2x"},{"filename":"wetland@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"wetland.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland.svg
new file mode 100644
index 000000000..7649f0c89
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="wetland" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M1.48,4.5C1.905,4.1467,2.4483,3.968,3,4c1.2273-0.0869,2.3154,0.7836,2.5,2l0.78,4.68c-0.6394-0.2893-1.3759-0.2709-2,0.05&#xA;&#x9;L3.48,6C3.1874,5.1347,2.3926,4.5387,1.48,4.5z M7.48,11.24c0.3816-0.3076,0.825-0.5293,1.3-0.65L10,3&#xA;&#x9;c0.2926-0.8653,1.0874-1.4613,2-1.5c-0.4198-0.3485-0.955-0.5269-1.5-0.5C9.2727,0.9131,8.1846,1.7836,8,3l-1.3,7.79&#xA;&#x9;C6.9786,10.9052,7.2408,11.0565,7.48,11.24z M11.8,10.74L11.8,10.74c0.1565-0.1277,0.3238-0.2414,0.5-0.34L13,6&#xA;&#x9;c0.2926-0.8653,1.0874-1.4613,2-1.5c-0.4198-0.3485-0.955-0.5269-1.5-0.5c-1.2273-0.0869-2.3154,0.7836-2.5,2l-0.67,4&#xA;&#x9;C10.8731,10.123,11.3778,10.377,11.8,10.74z M14,12L14,12c-0.4346-0.01-0.8579,0.1394-1.19,0.42l-0.47,0.41&#xA;&#x9;c-0.2847,0.2546-0.7153,0.2546-1,0c-0.15-0.12-0.29-0.26-0.44-0.39c-0.7076-0.5968-1.7424-0.5968-2.45,0&#xA;&#x9;c-0.16,0.13-0.31,0.28-0.47,0.41c-0.2847,0.2546-0.7153,0.2546-1,0c-0.16-0.13-0.31-0.28-0.47-0.41&#xA;&#x9;c-0.7059-0.5912-1.7341-0.5912-2.44,0c-0.15,0.13-0.29,0.27-0.44,0.39c-0.0892,0.0715-0.1909,0.1258-0.3,0.16&#xA;&#x9;c-0.2922,0.0652-0.5969-0.0301-0.8-0.25c-0.2475-0.214-0.5117-0.4079-0.79-0.58C1.5336,12.0421,1.2974,11.9865,1.06,12H1&#xA;&#x9;c-0.2761,0-0.5,0.2239-0.5,0.5S0.7239,13,1,13l0,0c0.246,0.0145,0.4762,0.126,0.64,0.31L2,13.57&#xA;&#x9;c0.6717,0.55,1.6308,0.5747,2.33,0.06c0.19-0.14,0.36-0.32,0.55-0.47c0.2847-0.2546,0.7153-0.2546,1,0l0.39,0.35&#xA;&#x9;c0.6937,0.6189,1.7322,0.6484,2.46,0.07c0.15-0.11,0.27-0.25,0.42-0.37c0.2976-0.3038,0.7851-0.3087,1.0889-0.0111&#xA;&#x9;c0.0037,0.0037,0.0074,0.0074,0.0111,0.0111l0.39,0.35c0.4866,0.4124,1.1485,0.5516,1.76,0.37c0.3825-0.1036,0.7286-0.3113,1-0.6&#xA;&#x9;c0.1549-0.1772,0.3674-0.294,0.6-0.33l0,0c0.2761,0,0.5-0.2239,0.5-0.5S14.2761,12,14,12z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@1x.png
deleted file mode 100644
index 92149d57b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@2x.png
deleted file mode 100644
index 80abb8e41..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@3x.png
deleted file mode 100644
index ec12ef280..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/wetland.imageset/wetland@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/Contents.json
index 81ef9200c..520416a99 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"wheelchair@1x.png","idiom":"universal","scale":"1x"},{"filename":"wheelchair@2x.png","idiom":"universal","scale":"2x"},{"filename":"wheelchair@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"wheelchair.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair.svg
new file mode 100644
index 000000000..e515a7da4
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="wheelchair" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M12,1.5C12,2.3284,11.3284,3,10.5,3S9,2.3284,9,1.5S9.6716,0,10.5,0S12,0.6716,12,1.5z M2.82,4.87l1.74-1.71l1.85,1.29&#xA;&#x9;L5.67,5.7c1.0747,0.3341,2.0207,0.9904,2.71,1.88l0.88-1.5c0.2295-0.4158,0.0785-0.939-0.3373-1.1685&#xA;&#x9;C8.9218,4.911,8.9209,4.9105,8.92,4.91L8.3,4.54L4.79,2.1C4.5927,1.9594,4.3231,1.9805,4.15,2.15l-2,2&#xA;&#x9;C1.9852,4.3716,2.0312,4.6848,2.2528,4.8496C2.4193,4.9735,2.645,4.9816,2.82,4.87z M8.13,10.94&#xA;&#x9;c-0.0143,1.2308-0.5794,2.3904-1.54,3.16c-0.7118,0.5804-1.6016,0.8982-2.52,0.9C1.8261,15,0.0055,13.1839,0,10.94&#xA;&#x9;c0.0023-0.9231,0.3238-1.8169,0.91-2.53c0.1868-0.232,0.398-0.4432,0.63-0.63c0.7131-0.5862,1.6069-0.9077,2.53-0.91&#xA;&#x9;C6.3139,6.8755,8.13,8.6961,8.13,10.94z M6,12.21C6.7679,11.2051,6.5758,9.7679,5.5709,9C4.7501,8.3727,3.6109,8.3727,2.79,9&#xA;&#x9;C2.5283,9.151,2.311,9.3683,2.16,9.63c-0.6923,1.0584-0.3956,2.4777,0.6628,3.17c0.7615,0.4981,1.7457,0.4981,2.5072,0&#xA;&#x9;C5.5805,12.6365,5.8061,12.4378,6,12.21z M14.2,13.21l-2.49-5C11.5906,7.9251,11.3088,7.7425,11,7.75H8.51&#xA;&#x9;c0.3293,0.4578,0.5856,0.9638,0.76,1.5h1.26l2.29,4.58c0.185,0.3728,0.6372,0.525,1.01,0.34c0.3728-0.185,0.525-0.6372,0.34-1.01&#xA;&#x9;L14.2,13.21z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@1x.png
deleted file mode 100644
index d4aa864bc..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@2x.png
deleted file mode 100644
index a35b0548a..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@3x.png
deleted file mode 100644
index ae9548216..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/wheelchair.imageset/wheelchair@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/Contents.json
index 42afde571..3718913e9 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"windmill@1x.png","idiom":"universal","scale":"1x"},{"filename":"windmill@2x.png","idiom":"universal","scale":"2x"},{"filename":"windmill@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"windmill.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill.svg
new file mode 100644
index 000000000..c9fa6144e
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="windmill" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6,5L3.5,7.5l1,1L7,6V5.5L7.5,5L8,5.5V6l2.5,2.5l1-1L9,5H8.5L8,4.5L8.5,4H9l2.5-2.5l-1-1L8,3v0.5L7.5,4L7,3.5V3L4.5,0.5&#xA;&#x9;l-1,1L6,4h0.5L7,4.5L6.5,5H6z M11.5,13h-1l-1-4l-2-2l-2,2l-1,4h-1C3.2239,13,3,13.2238,3,13.5C3,13.7761,3.2239,14,3.5,14h8&#xA;&#x9;c0.2761,0,0.5-0.2239,0.5-0.5C12,13.2238,11.7761,13,11.5,13z M8,13H7v-1.5024C7,11.2228,7.2228,11,7.4976,11&#xA;&#x9;C7.7751,11,8,11.2249,8,11.5024V13z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@1x.png
deleted file mode 100644
index 527ee3f63..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@2x.png
deleted file mode 100644
index 22f18f149..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@3x.png
deleted file mode 100644
index 11de366c6..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/windmill.imageset/windmill@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/Contents.json b/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/Contents.json
index 0047528c5..254f1d6f8 100644
--- a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/Contents.json
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/Contents.json
@@ -1 +1 @@
-{"images":[{"filename":"zoo@1x.png","idiom":"universal","scale":"1x"},{"filename":"zoo@2x.png","idiom":"universal","scale":"2x"},{"filename":"zoo@3x.png","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}
+{"images":[{"filename":"zoo.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo.svg b/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo.svg
new file mode 100644
index 000000000..a587fceaa
--- /dev/null
+++ b/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="zoo" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path17499" d="&#xA;&#x9;M8.3879,3.8928C8.3879,3.8928,7.6818,5,7,5H4.5C3.8182,5,3.2016,5.4086,2.7273,5.8636L0.5,8C0.231,8.258,0.0072,8.7681,0,9&#xA;&#x9;c-0.0156,0.5,0,1,0,1s1,0,1-1V8.5l1-1h0.5l0.158,0.2892c0,0-0.9535,1.8244-0.9535,3.5289C1.7046,12,2.3864,12,2.3864,12h0.6818&#xA;&#x9;c0,0,0.3409,0,0-0.3409l-0.3409-0.3409C2.7273,10.6364,3.5002,9.6667,4,9c0,0,0.0168,1.1579,0,2c-0.008,0.4096,0.2721,1,0.6818,1&#xA;&#x9;h0.6818c0,0,0.3409,0,0-0.3409l-0.3409-0.3409C4.7105,10.7495,5.5,8.5,5.5,8.5C6.7716,8.5,7,9,8.5,9l0.3636,2.3182&#xA;&#x9;C8.975,12.0282,9.5,12,9.5,12H11c0.3409,0,0.9611-0.3115,0.3409-0.7736L11,11V9c1.2142-0.1722,2-1,2-2h1c0.3214,0,1,0,1-0.5v-1&#xA;&#x9;l-1.7045-1.6818C12.5444,3.0772,12,2.5,11,2.5C9.5469,2.5,8.8636,3.0688,8.3879,3.8928z"/>
+</svg>
\ No newline at end of file
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@1x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@1x.png
deleted file mode 100644
index edeb0126d..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@1x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@2x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@2x.png
deleted file mode 100644
index 5c3f17d7b..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@2x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@3x.png b/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@3x.png
deleted file mode 100644
index e4d5bf190..000000000
Binary files a/Sources/MapboxSearchUI/Assets.xcassets/maki/zoo.imageset/zoo@3x.png and /dev/null differ
diff --git a/Sources/MapboxSearchUI/HotCategoryButton.swift b/Sources/MapboxSearchUI/HotCategoryButton.swift
index 36de34f3a..dcc396fe9 100644
--- a/Sources/MapboxSearchUI/HotCategoryButton.swift
+++ b/Sources/MapboxSearchUI/HotCategoryButton.swift
@@ -39,7 +39,14 @@ class HotCategoryButton: UIControl {
     private func updateUI() {
         textLabel.text = category.name
         categoryButton.accessibilityIdentifier = "HotCategoryButton." + category.legacyName
-        categoryButton.setImage(category.icon?.withRenderingMode(.alwaysTemplate), for: .normal)
+        let image = category.icon?
+            .withRenderingMode(.alwaysTemplate)
+        categoryButton.setImage(image, for: .normal)
+
+        categoryButton.contentHorizontalAlignment = .fill
+        categoryButton.contentVerticalAlignment = .fill
+        categoryButton.imageView?.contentMode = .scaleAspectFit
+        categoryButton.imageEdgeInsets = UIEdgeInsets(top: 2, left: 2, bottom: 2, right: 2)
 
         textLabel.textColor = configuration.style.primaryTextColor
         categoryButton.backgroundColor = configuration.style.secondaryBackgroundColor
diff --git a/Sources/MapboxSearchUI/HotCategoryButton.xib b/Sources/MapboxSearchUI/HotCategoryButton.xib
index df591407e..bbaafcd56 100644
--- a/Sources/MapboxSearchUI/HotCategoryButton.xib
+++ b/Sources/MapboxSearchUI/HotCategoryButton.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -16,8 +16,12 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" verticalCompressionResistancePriority="800" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9GK-FZ-Tao">
-                    <rect key="frame" x="12" y="0.0" width="20" height="38"/>
+                    <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
                     <color key="backgroundColor" name="mapbox searchbar background"/>
+                    <constraints>
+                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="Lu8-yH-cbw"/>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="xL2-EL-iBm"/>
+                    </constraints>
                     <color key="tintColor" name="mapbox icon tint"/>
                     <inset key="contentEdgeInsets" minX="10" minY="10" maxX="10" maxY="10"/>
                     <userDefinedRuntimeAttributes>
@@ -30,7 +34,7 @@
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="N/A" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s3z-xA-8UF">
-                    <rect key="frame" x="0.0" y="42" width="44" height="27"/>
+                    <rect key="frame" x="0.0" y="48" width="44" height="21"/>
                     <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="15"/>
                     <color key="textColor" name="mapbox text"/>
                     <nil key="highlightedColor"/>
diff --git a/Sources/MapboxSearchUI/Maki+Extensions.swift b/Sources/MapboxSearchUI/Maki+Extensions.swift
index a3409adba..98307ecef 100644
--- a/Sources/MapboxSearchUI/Maki+Extensions.swift
+++ b/Sources/MapboxSearchUI/Maki+Extensions.swift
@@ -2,8 +2,8 @@ import MapboxSearch
 import UIKit
 
 extension Maki {
-    /// Make name in Assets Catalog including maki prefix.
-    public var xcassetName: String { "maki/" + name }
+    /// Name in Assets Catalog.
+    public var xcassetName: String { name }
 
     var icon: UIImage {
         UIImage(named: xcassetName, in: .mapboxSearchUI, compatibleWith: nil)!
diff --git a/Sources/MapboxSearchUI/SearchCategory.swift b/Sources/MapboxSearchUI/SearchCategory.swift
index 58f7dbdb0..18f5b41a1 100644
--- a/Sources/MapboxSearchUI/SearchCategory.swift
+++ b/Sources/MapboxSearchUI/SearchCategory.swift
@@ -127,7 +127,7 @@ extension SearchCategory {
             canonicalId: "hotel",
             name: Strings.Categories.hotel,
             legacyName: "hotel",
-            iconName: "maki/hotel"
+            iconName: Maki.lodging.xcassetName
         )
 
     /// Gas Station category.
@@ -244,7 +244,7 @@ extension SearchCategory {
             canonicalId: "nightclub",
             name: Strings.Categories.nightclub,
             legacyName: "nightclub",
-            iconName: "maki/nightclub"
+            iconName: Maki.nightclub.xcassetName
         )
 
     /// Auto repair category.
@@ -253,7 +253,7 @@ extension SearchCategory {
             canonicalId: "auto_repair",
             name: Strings.Categories.autoRepair,
             legacyName: "auto repair",
-            iconName: "maki/auto-repair"
+            iconName: Maki.carRepair.xcassetName
         )
 
     /// ATM category.
diff --git a/scripts/generate_maki.sh b/scripts/generate_maki.sh
index 738703045..7dc040b14 100755
--- a/scripts/generate_maki.sh
+++ b/scripts/generate_maki.sh
@@ -6,7 +6,6 @@ TEMPORARY_DIR=$(mktemp -d)
 
 OUTPUT_PATH="${SCRIPT_PATH}/../Sources/MapboxSearch/PublicAPI/Maki.swift"
 GENERATED_MAKI_OUTPUT_PATH="${SCRIPT_PATH}/../Sources/MapboxSearchUI/Assets.xcassets/maki/"
-CUSTOM_MAKI_IMAGESETS_PATH="${SCRIPT_PATH}/../Sources/MapboxSearchUI/Assets.xcassets/Custom maki/maki/"
 PREV_GENERATED_MAKI_OUTPUT_PATH="${TEMPORARY_DIR}/prev_maki/"
 
 GENERATED_PNG_OUTPUT_SIZE_PT=24
@@ -27,6 +26,7 @@ echo "Maki.swift generation"
 cat <<EOF > "${OUTPUT_PATH}"
 // This file was generated by '$(basename $0)' script
 
+// swiftformat:disable:next redundantRawValues
 /// Represents static enumeration for all available icons in Mapbox [Maki icon set](https://github.com/mapbox/maki/).
 /// Kebab-case was replaced with camelCase.
 public enum Maki: String, CaseIterable, Codable {
@@ -46,7 +46,7 @@ for file in ${MAKI_ICON_PATHS}; do
 done
 
 cat <<EOF >> "${OUTPUT_PATH}"
-    
+
     /// Original name used in Maki icon set
     public var name: String { rawValue }
 }
@@ -57,22 +57,8 @@ echo "Validate Maki.swift"
 swiftc "${OUTPUT_PATH}" -o /dev/null
 
 
-
-echo "SVG-to-PNGs convertion"
-generatePNGs() {
-    if ! [ -x "$(command -v rsvg-convert)" ]; then
-        echo -e '\033[93m\tSkipping PNGs generation\033[0m: rsvg-convert is not installed.' >&2
-        echo -e '\tInstallation: brew install librsvg' >&2
-        return
-    fi
-
-    if ! [ -x "$(command -v convert)" ]; then
-        echo -e '\033[93m\tSkipping PNGs generation\033[0m: imagemagick is not installed.' >&2
-        echo -e '\tInstallation: brew install imagemagick' >&2
-        return
-    fi
-
-
+echo "Copying SVG sources"
+copy_svg_sources() {
     # Clean xcassets Maki
     mv "$GENERATED_MAKI_OUTPUT_PATH" "$PREV_GENERATED_MAKI_OUTPUT_PATH"
 
@@ -80,52 +66,15 @@ generatePNGs() {
         filefolder=$(dirname "$file")
         filename=$(basename "$file" .svg)
 
-        if [ -d "${CUSTOM_MAKI_IMAGESETS_PATH}/${filename}.imageset/" ]; then
-            echo -e "\tFound custom Maki icon \033[1m${filename}\033[0m. Skipping"
-            continue
-        fi
-
-        # Skip if exists in "Custom maki/maki/${filename}.imageset"
         local CURRENT_ICON_IMAGESET_OUTPUT_PATH="${GENERATED_MAKI_OUTPUT_PATH}/${filename}.imageset/"
         mkdir -p "${CURRENT_ICON_IMAGESET_OUTPUT_PATH}"
 
-        for scale in 1 2 3; do
-            local filename_scale="${filename}@${scale}x"
-            local output_path="${CURRENT_ICON_IMAGESET_OUTPUT_PATH}/${filename_scale}.png"
-            local tmp_output_path="${CURRENT_ICON_IMAGESET_OUTPUT_PATH}/${filename_scale}.png"
-            local heightSize=$(((GENERATED_PNG_OUTPUT_SIZE_PT-GENERATED_PNG_NONE_BORDER_WIDTH_PT*2)*scale))
-            
-            # Convert SVG to PNG
-            rsvg-convert "${filefolder}/${filename}.svg" -h ${heightSize} -o "${tmp_output_path}"
-
-            if [ "$GENERATED_PNG_NONE_BORDER_WIDTH_PT" != 0 ]; then
-                convert "${tmp_output_path}" -bordercolor none -border $GENERATED_PNG_NONE_BORDER_WIDTH_PT "${tmp_output_path}"
-            fi
-
-            local prev_filepath="$PREV_GENERATED_MAKI_OUTPUT_PATH/${filename}.imageset/${filename}@${scale}x.png"
-            if [ -f "$prev_filepath" ]; then
-                DIFF_VALUE=$(compare -metric MAE "$prev_filepath" "$tmp_output_path" null: 2>&1) || true
-                
-                if [ "$DIFF_VALUE" = "0 (0)" ]; then
-                    # Files are equal copy back original file
-                    rm "$tmp_output_path"
-                    cp "$prev_filepath" "$output_path"
-                else
-                    # Replace file if there is some diff
-                    mv "$tmp_output_path" "$output_path"
-
-                    if [ "$DEBUG" = "1" ]; then
-                        compare -metric MAE "$prev_filepath" "$tmp_output_path" "$output_path-diff.png" &>/dev/null || true
-                    fi
-                fi
-            fi
-        done
-
-        IMAGESET_CONTENT_JSON='{"images":[{"filename":"'"${filename}@1x.png"'","idiom":"universal","scale":"1x"},{"filename":"'"${filename}@2x.png"'","idiom":"universal","scale":"2x"},{"filename":"'"${filename}@3x.png"'","idiom":"universal","scale":"3x"}],"info":{"author":"generate_maki.sh","version":1}}'
-        echo "${IMAGESET_CONTENT_JSON}" > "${CURRENT_ICON_IMAGESET_OUTPUT_PATH}/Contents.json"
+        mv ${file} ${CURRENT_ICON_IMAGESET_OUTPUT_PATH}
 
+        IMAGESET_CONTENT_JSON='{"images":[{"filename":"'"${filename}"'.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true}}'
+        echo "${IMAGESET_CONTENT_JSON}" > "${CURRENT_ICON_IMAGESET_OUTPUT_PATH}/Contents.json"
     done
 }
-generatePNGs
+copy_svg_sources
 
-echo "Done. Number of icons: $i"
\ No newline at end of file
+echo "Done. Number of icons: $i"