diff --git a/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt b/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt
index 84d8299..2795cdb 100755
--- a/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt
+++ b/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt
@@ -55,7 +55,7 @@ fun NavigationSheet(
                     simulateNavigation()
                 }) {
                     Icon(
-                        painter = painterResource(id = R.drawable.assistant_navigation_48px),
+                        painter = painterResource(id = R.drawable.navigation_48px),
                         "Simulate",
                         modifier = Modifier.size(24.dp, 24.dp),
                     )
diff --git a/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt b/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt
index 2cfa951..0ae2588 100644
--- a/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt
+++ b/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt
@@ -151,7 +151,7 @@ fun SearchBar(
                 SearchBarDefaults.InputField(
                     leadingIcon = {
                         Icon(
-                            painter = painterResource(id = R.drawable.ic_search_black36dp),
+                            painter = painterResource(id = R.drawable.search_48px),
                             "Search",
                             modifier = Modifier.size(24.dp, 24.dp),
                         )
diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml
new file mode 100644
index 0000000..9dbd3ce
--- /dev/null
+++ b/app/src/main/res/xml/automotive_app_desc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<automotiveApp>
+  <uses name="template" />
+</automotiveApp>
diff --git a/automotive/src/main/res/values/strings.xml b/automotive/src/main/res/values/strings.xml
new file mode 100644
index 0000000..4e441ec
--- /dev/null
+++ b/automotive/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Navigation</string>
+</resources>
\ No newline at end of file
diff --git a/automotive/src/main/res/xml/automotive_app_desc.xml b/automotive/src/main/res/xml/automotive_app_desc.xml
new file mode 100644
index 0000000..9dbd3ce
--- /dev/null
+++ b/automotive/src/main/res/xml/automotive_app_desc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<automotiveApp>
+  <uses name="template" />
+</automotiveApp>
diff --git a/automotive/src/main/res/xml/file_provider_paths.xml b/automotive/src/main/res/xml/file_provider_paths.xml
new file mode 100644
index 0000000..281517c
--- /dev/null
+++ b/automotive/src/main/res/xml/file_provider_paths.xml
@@ -0,0 +1,18 @@
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<paths>
+  <files-path name="res" path="/res"/>
+</paths>
diff --git a/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt b/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt
index 5cc062e..5451e07 100644
--- a/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt
@@ -1,5 +1,6 @@
 package com.kouros.navigation.car.map
 
+import android.annotation.SuppressLint
 import android.location.Location
 import android.content.Context
 import androidx.compose.foundation.Canvas
@@ -115,41 +116,41 @@ fun MapLibre(
 fun RouteLayer(routeData: String?) {
     if (routeData != null && routeData.isNotEmpty()) {
         val routes = rememberGeoJsonSource(GeoJsonData.JsonString(routeData))
-            LineLayer(
-                id = "routes-casing",
-                source = routes,
-                color = const(Color.White),
-                width =
-                    interpolate(
-                        type = exponential(1.2f),
-                        input = zoom(),
-                        5 to const(0.4.dp),
-                        6 to const(0.8.dp),
-                        7 to const(2.0.dp),
-                        20 to const(24.dp),
-                    ),
-            )
-            LineLayer(
-                id = "routes",
-                source = routes,
-                color = const(RouteColor),
-                width =
-                    interpolate(
-                        type = exponential(1.2f),
-                        input = zoom(),
-                        5 to const(0.4.dp),
-                        6 to const(0.7.dp),
-                        7 to const(1.75.dp),
-                        20 to const(22.dp),
-                    ),
-            )
+        LineLayer(
+            id = "routes-casing",
+            source = routes,
+            color = const(Color.White),
+            width =
+                interpolate(
+                    type = exponential(1.2f),
+                    input = zoom(),
+                    5 to const(0.4.dp),
+                    6 to const(0.8.dp),
+                    7 to const(2.0.dp),
+                    20 to const(24.dp),
+                ),
+        )
+        LineLayer(
+            id = "routes",
+            source = routes,
+            color = const(RouteColor),
+            width =
+                interpolate(
+                    type = exponential(1.2f),
+                    input = zoom(),
+                    5 to const(0.4.dp),
+                    6 to const(0.7.dp),
+                    7 to const(1.75.dp),
+                    20 to const(22.dp),
+                ),
+        )
     }
 }
 
 @Composable
 fun AmenityLayer(routeData: String?) {
     if (routeData != null && routeData.isNotEmpty()) {
-          val color = if (routeData.contains(Constants.PHARMACY)) {
+        val color = if (routeData.contains(Constants.PHARMACY)) {
             const(Color.Red)
         } else {
             const(Color.Green)
@@ -164,6 +165,7 @@ fun AmenityLayer(routeData: String?) {
         )
     }
 }
+
 @Composable
 fun BuildingLayer(tiles: Source) {
     Anchor.Replace("building-3d") {
@@ -177,7 +179,13 @@ fun BuildingLayer(tiles: Source) {
 }
 
 @Composable
-fun DrawNavigationImages(padding: PaddingValues, speed: Float?, maxSpeed: Int, width: Int, height: Int) {
+fun DrawNavigationImages(
+    padding: PaddingValues,
+    speed: Float?,
+    maxSpeed: Int,
+    width: Int,
+    height: Int
+) {
     NavigationImage(padding, width, height)
     CurrentSpeed(width, height, speed)
     if (speed != null && maxSpeed > 0 && (speed * 3.6) > maxSpeed) {
@@ -199,7 +207,7 @@ fun NavigationImage(padding: PaddingValues, width: Int, height: Int) {
             }
         }
         Icon(
-            painter = painterResource(id = R.drawable.navigation),
+            painter = painterResource(id = R.drawable.navigation_48px),
             "Navigation",
             tint = color.copy(alpha = 1f),
             modifier = Modifier.size(imageSize.dp, imageSize.dp),
diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt
index eeb6870..5044536 100644
--- a/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt
@@ -294,7 +294,7 @@ class NavigationScreen(
                 CarIcon.Builder(
                     IconCompat.createWithResource(
                         carContext,
-                        R.drawable.assistant_navigation_48px
+                        R.drawable.navigation_48px
                     )
                 )
                     .build()
@@ -328,7 +328,7 @@ class NavigationScreen(
 
     private fun searchAction(): Action {
         return Action.Builder()
-            .setIcon(routeModel.createCarIcon(carContext, R.drawable.ic_search_black36dp))
+            .setIcon(routeModel.createCarIcon(carContext, R.drawable.search_48px))
             .setOnClickListener {
                 startSearchScreen()
             }
@@ -337,7 +337,7 @@ class NavigationScreen(
 
     private fun settingsAction(): Action {
         return Action.Builder()
-            .setIcon(routeModel.createCarIcon(carContext, R.drawable.settings_24px))
+            .setIcon(routeModel.createCarIcon(carContext, R.drawable.settings_applications_48px))
             .setOnClickListener {
                 screenManager.push(SettingsScreen(carContext))
             }
diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt
index dc454b3..acd6776 100644
--- a/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt
@@ -152,7 +152,7 @@ class PlaceListScreen(
         .setIcon(
             RouteCarModel().createCarIcon(
                 carContext,
-                R.drawable.ic_delete_foreground
+                R.drawable.ic_pan_24
             )
         )
         .setOnClickListener {
diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt
index 39a3267..9b3d1b3 100644
--- a/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt
@@ -143,7 +143,7 @@ class RoutePreviewScreen(
                         .getString(R.string.favorites)
                 else
                     carContext.getString(
-                        R.string.not_favorite_toast_msg
+                        R.string.favorites
                     ),
                 CarToast.LENGTH_SHORT
             )
@@ -165,7 +165,7 @@ class RoutePreviewScreen(
             CarIcon.Builder(
                 IconCompat.createWithResource(
                     carContext,
-                    R.drawable.ic_delete_foreground
+                    R.drawable.ic_pan_24
                 )
             )
                 .build()
diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt
index 44f3e37..d3313fb 100644
--- a/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt
@@ -137,7 +137,7 @@ class SearchScreen(
                 R.drawable.ic_favorite_white_24dp
             }
             else -> {
-                R.drawable.navigation
+                R.drawable.navigation_48px
             }
         }
         return CarIcon.Builder(
diff --git a/common/data/src/main/res/drawable/ev_station_48px.xml b/common/data/src/main/res/drawable/ev_station_48px.xml
index 4681f9c..dce7655 100644
--- a/common/data/src/main/res/drawable/ev_station_48px.xml
+++ b/common/data/src/main/res/drawable/ev_station_48px.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M220,408L489,408L489,180Q489,180 489,180Q489,180 489,180L220,180Q220,180 220,180Q220,180 220,180L220,408ZM160,840L160,180Q160,156 178,138Q196,120 220,120L489,120Q513,120 531,138Q549,156 549,180L549,468L614,468Q634.71,468 649.36,482.64Q664,497.29 664,518L664,737Q664,759 681.5,773.5Q699,788 722,788Q745,788 765,773.5Q785,759 785,737L785,350L770,350Q757.25,350 748.63,341.37Q740,332.75 740,320L740,230L760,230L760,180L790,180L790,230L830,230L830,180L860,180L860,230L880,230L880,320Q880,332.75 871.38,341.37Q862.75,350 850,350L835,350L835,736.69Q835,780 801,810Q767,840 721.82,840Q677.66,840 645.83,810Q614,780 614,737L614,518Q614,518 614,518Q614,518 614,518L549,518L549,840L160,840ZM337,746L425,606L372,606L372,501L285,641L337,641L337,746Z"/>
+      android:pathData="M337,746L425,606L372,606L372,501L285,641L337,641L337,746ZM220,408L489,408L489,180Q489,180 489,180Q489,180 489,180L220,180Q220,180 220,180Q220,180 220,180L220,408ZM220,780L489,780L489,468L220,468L220,780ZM160,840L160,180Q160,156 178,138Q196,120 220,120L489,120Q513,120 531,138Q549,156 549,180L549,468L614,468Q634.71,468 649.36,482.64Q664,497.29 664,518L664,737Q664,759 681.5,773.5Q699,788 722,788Q745,788 765,773.5Q785,759 785,737L785,350L770,350Q757.25,350 748.63,341.37Q740,332.75 740,320L740,230L760,230L760,180L790,180L790,230L830,230L830,180L860,180L860,230L880,230L880,320Q880,332.75 871.38,341.37Q862.75,350 850,350L835,350L835,736.69Q835,780 801,810Q767,840 721.82,840Q677.66,840 645.83,810Q614,780 614,737L614,518Q614,518 614,518Q614,518 614,518L549,518L549,840L160,840ZM489,780L220,780L220,780L489,780Z"/>
 </vector>
diff --git a/common/data/src/main/res/drawable/ic_close_white_24dp.xml b/common/data/src/main/res/drawable/ic_close_white_24dp.xml
new file mode 100644
index 0000000..5832c5a
--- /dev/null
+++ b/common/data/src/main/res/drawable/ic_close_white_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright 2022 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.4,19 L5,17.6 10.6,12 5,6.4 6.4,5 12,10.6 17.6,5 19,6.4 13.4,12 19,17.6 17.6,19 12,13.4Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/ic_favorite_filled_white_24dp.xml b/common/data/src/main/res/drawable/ic_favorite_filled_white_24dp.xml
new file mode 100644
index 0000000..d3df144
--- /dev/null
+++ b/common/data/src/main/res/drawable/ic_favorite_filled_white_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright 2022 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,21 L10.55,19.7Q6.625,16.2 4.312,13.612Q2,11.025 2,8.15Q2,5.8 3.575,4.225Q5.15,2.65 7.5,2.65Q8.825,2.65 10,3.212Q11.175,3.775 12,4.75Q12.825,3.775 14,3.212Q15.175,2.65 16.5,2.65Q18.85,2.65 20.425,4.225Q22,5.8 22,8.15Q22,11.025 19.688,13.612Q17.375,16.2 13.45,19.7ZM12,18.3Q8.425,15.05 6.213,12.7Q4,10.35 4,8.15Q4,6.65 5,5.65Q6,4.65 7.5,4.65Q8.675,4.65 9.675,5.312Q10.675,5.975 11.05,7H12.95Q13.325,5.975 14.325,5.312Q15.325,4.65 16.5,4.65Q18,4.65 19,5.65Q20,6.65 20,8.15Q20,10.35 17.788,12.7Q15.575,15.05 12,18.3ZM12,18.3Q15.575,15.05 17.788,12.7Q20,10.35 20,8.15Q20,6.65 19,5.65Q18,4.65 16.5,4.65Q15.325,4.65 14.325,5.312Q13.325,5.975 12.95,7H11.05Q10.675,5.975 9.675,5.312Q8.675,4.65 7.5,4.65Q6,4.65 5,5.65Q4,6.65 4,8.15Q4,10.35 6.213,12.7Q8.425,15.05 12,18.3Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/ic_favorite_white_24dp.xml b/common/data/src/main/res/drawable/ic_favorite_white_24dp.xml
new file mode 100644
index 0000000..7709015
--- /dev/null
+++ b/common/data/src/main/res/drawable/ic_favorite_white_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright 2022 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,21 L10.55,19.7Q6.625,16.2 4.312,13.612Q2,11.025 2,8.15Q2,5.8 3.575,4.225Q5.15,2.65 7.5,2.65Q8.825,2.65 10,3.212Q11.175,3.775 12,4.75Q12.825,3.775 14,3.212Q15.175,2.65 16.5,2.65Q18.85,2.65 20.425,4.225Q22,5.8 22,8.15Q22,11.025 19.688,13.612Q17.375,16.2 13.45,19.7ZM12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475Q12,11.475 12,11.475ZM12,18.3Q15.575,15.05 17.788,12.7Q20,10.35 20,8.15Q20,6.65 19,5.65Q18,4.65 16.5,4.65Q15.325,4.65 14.325,5.312Q13.325,5.975 12.95,7H11.05Q10.675,5.975 9.675,5.312Q8.675,4.65 7.5,4.65Q6,4.65 5,5.65Q4,6.65 4,8.15Q4,10.35 6.213,12.7Q8.425,15.05 12,18.3Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/ic_pan_24.xml b/common/data/src/main/res/drawable/ic_pan_24.xml
new file mode 100644
index 0000000..1dfeed1
--- /dev/null
+++ b/common/data/src/main/res/drawable/ic_pan_24.xml
@@ -0,0 +1,28 @@
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.54,5.54L13.77,7.3 12,5.54 10.23,7.3 8.46,5.54 12,2zM18.46,15.54l-1.76,-1.77L18.46,12l-1.76,-1.77 1.76,-1.77L22,12zM8.46,18.46l1.77,-1.76L12,18.46l1.77,-1.76 1.77,1.76L12,22zM5.54,8.46l1.76,1.77L5.54,12l1.76,1.77 -1.76,1.77L2,12z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/ic_place_white_24dp.xml b/common/data/src/main/res/drawable/ic_place_white_24dp.xml
new file mode 100644
index 0000000..1ba39ce
--- /dev/null
+++ b/common/data/src/main/res/drawable/ic_place_white_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM18,10.2C18,6.57 15.35,4 12,4s-6,2.57 -6,6.2c0,2.34 1.95,5.44 6,9.14 4.05,-3.7 6,-6.8 6,-9.14zM12,2c4.2,0 8,3.22 8,8.2 0,3.32 -2.67,7.25 -8,11.8 -5.33,-4.55 -8,-8.48 -8,-11.8C4,5.22 7.8,2 12,2z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/ic_roundabout_ccw.png b/common/data/src/main/res/drawable/ic_roundabout_ccw.png
new file mode 100644
index 0000000..478f371
Binary files /dev/null and b/common/data/src/main/res/drawable/ic_roundabout_ccw.png differ
diff --git a/common/data/src/main/res/drawable/ic_turn_destination.png b/common/data/src/main/res/drawable/ic_turn_destination.png
new file mode 100644
index 0000000..4dde74e
Binary files /dev/null and b/common/data/src/main/res/drawable/ic_turn_destination.png differ
diff --git a/common/data/src/main/res/drawable/ic_turn_name_change.png b/common/data/src/main/res/drawable/ic_turn_name_change.png
new file mode 100644
index 0000000..363fc89
Binary files /dev/null and b/common/data/src/main/res/drawable/ic_turn_name_change.png differ
diff --git a/common/data/src/main/res/drawable/ic_turn_normal_left.png b/common/data/src/main/res/drawable/ic_turn_normal_left.png
new file mode 100644
index 0000000..572a48c
Binary files /dev/null and b/common/data/src/main/res/drawable/ic_turn_normal_left.png differ
diff --git a/common/data/src/main/res/drawable/ic_turn_normal_right.png b/common/data/src/main/res/drawable/ic_turn_normal_right.png
new file mode 100644
index 0000000..b9cc652
Binary files /dev/null and b/common/data/src/main/res/drawable/ic_turn_normal_right.png differ
diff --git a/common/data/src/main/res/drawable/ic_turn_slight_left.png b/common/data/src/main/res/drawable/ic_turn_slight_left.png
new file mode 100644
index 0000000..0a0d417
Binary files /dev/null and b/common/data/src/main/res/drawable/ic_turn_slight_left.png differ
diff --git a/common/data/src/main/res/drawable/ic_turn_slight_right.png b/common/data/src/main/res/drawable/ic_turn_slight_right.png
new file mode 100644
index 0000000..bfcb32b
Binary files /dev/null and b/common/data/src/main/res/drawable/ic_turn_slight_right.png differ
diff --git a/common/data/src/main/res/drawable/ic_zoom_in_24.xml b/common/data/src/main/res/drawable/ic_zoom_in_24.xml
new file mode 100644
index 0000000..36d3282
--- /dev/null
+++ b/common/data/src/main/res/drawable/ic_zoom_in_24.xml
@@ -0,0 +1,25 @@
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/ic_zoom_out_24.xml b/common/data/src/main/res/drawable/ic_zoom_out_24.xml
new file mode 100644
index 0000000..089d265
--- /dev/null
+++ b/common/data/src/main/res/drawable/ic_zoom_out_24.xml
@@ -0,0 +1,25 @@
+<!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13H5v-2h14v2z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/local_gas_station_48px.xml b/common/data/src/main/res/drawable/local_gas_station_48px.xml
index 8efba2b..301dd10 100644
--- a/common/data/src/main/res/drawable/local_gas_station_48px.xml
+++ b/common/data/src/main/res/drawable/local_gas_station_48px.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M160,840L160,180Q160,156 178,138Q196,120 220,120L489,120Q513,120 531,138Q549,156 549,180L549,468L614,468Q634.63,468 649.31,482.69Q664,497.37 664,518L664,737Q664,758.68 679.5,773.34Q695,788 717,788Q739,788 754.5,773.34Q770,758.68 770,737L770,442Q759,448 747,451Q735,454 723,454Q683.52,454 656.26,426.74Q629,399.48 629,360Q629,328.39 647,303.19Q665,278 695,270L600,175L636,140L789,293Q803,307 811.5,323.5Q820,340 820,360L820,737Q820,780.26 790.18,810.13Q760.37,840 717.18,840Q674,840 644,810.13Q614,780.26 614,737L614,518Q614,518 614,518Q614,518 614,518L549,518L549,840L160,840ZM220,408L489,408L489,180Q489,180 489,180Q489,180 489,180L220,180Q220,180 220,180Q220,180 220,180L220,408ZM723,404Q741,404 754,391Q767,378 767,360Q767,342 754,329Q741,316 723,316Q705,316 692,329Q679,342 679,360Q679,378 692,391Q705,404 723,404Z"/>
+      android:pathData="M160,840L160,180Q160,156 178,138Q196,120 220,120L489,120Q513,120 531,138Q549,156 549,180L549,468L614,468Q634.63,468 649.31,482.69Q664,497.37 664,518L664,737Q664,758.68 679.5,773.34Q695,788 717,788Q739,788 754.5,773.34Q770,758.68 770,737L770,442Q759,448 747,451Q735,454 723,454Q683.52,454 656.26,426.74Q629,399.48 629,360Q629,328.39 647,303.19Q665,278 695,270L600,175L636,140L789,293Q803,307 811.5,323.5Q820,340 820,360L820,737Q820,780.26 790.18,810.13Q760.37,840 717.18,840Q674,840 644,810.13Q614,780.26 614,737L614,518Q614,518 614,518Q614,518 614,518L549,518L549,840L160,840ZM220,408L489,408L489,180Q489,180 489,180Q489,180 489,180L220,180Q220,180 220,180Q220,180 220,180L220,408ZM723,404Q741,404 754,391Q767,378 767,360Q767,342 754,329Q741,316 723,316Q705,316 692,329Q679,342 679,360Q679,378 692,391Q705,404 723,404ZM220,780L489,780L489,468L220,468L220,780ZM489,780L220,780L220,780L489,780Z"/>
 </vector>
diff --git a/common/data/src/main/res/drawable/local_pharmacy_48px.xml b/common/data/src/main/res/drawable/local_pharmacy_48px.xml
index c1ba6ad..c99e328 100644
--- a/common/data/src/main/res/drawable/local_pharmacy_48px.xml
+++ b/common/data/src/main/res/drawable/local_pharmacy_48px.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M120,840L120,780L207,525L120,270L120,210L647,210L709,40L777,67L725,210L840,210L840,270L752,525L840,780L840,840L120,840ZM452,679L512,679L512,555L636,555L636,495L512,495L512,371L452,371L452,495L328,495L328,555L452,555L452,679Z"/>
+      android:pathData="M120,840L120,780L207,525L120,270L120,210L647,210L709,40L777,67L725,210L840,210L840,270L752,525L840,780L840,840L120,840ZM452,679L512,679L512,555L636,555L636,495L512,495L512,371L452,371L452,495L328,495L328,555L452,555L452,679ZM182,780L778,780L690,525L778,270L182,270L270,525L182,780ZM480,525L480,525L480,525L480,525L480,525L480,525Z"/>
 </vector>
diff --git a/common/data/src/main/res/drawable/navigation_24px.xml b/common/data/src/main/res/drawable/navigation_24px.xml
new file mode 100644
index 0000000..6c4832f
--- /dev/null
+++ b/common/data/src/main/res/drawable/navigation_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,840L160,800L480,80L800,800L760,840L480,720L200,840ZM284,716L480,632L676,716L480,276L284,716ZM480,632L480,632L480,632L480,632Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/navigation_48px.xml b/common/data/src/main/res/drawable/navigation_48px.xml
new file mode 100644
index 0000000..e87c0a6
--- /dev/null
+++ b/common/data/src/main/res/drawable/navigation_48px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M190,840L160,810L480,80L800,810L770,840L480,708L190,840ZM258,742L480,644L702,742L480,228L258,742ZM480,644L480,644L480,644L480,644Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/pan_tool_48px.xml b/common/data/src/main/res/drawable/pan_tool_48px.xml
new file mode 100644
index 0000000..dc04dcd
--- /dev/null
+++ b/common/data/src/main/res/drawable/pan_tool_48px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M402,920Q375,920 350.5,907.5Q326,895 311,872L54,492L74,476Q91,461 113.5,457Q136,453 158.07,470.19L280,563L280,150Q280,137.25 288.68,128.62Q297.35,120 310.18,120Q323,120 331.5,128.62Q340,137.25 340,150L340,678L166,550L361,838Q368,849 378.5,854.5Q389,860 402,860L541,860L690,860Q728,860 754,834Q780,808 780,770L780,190Q780,177.25 788.68,168.62Q797.35,160 810.18,160Q823,160 831.5,168.62Q840,177.25 840,190L840,770Q840,833 796.5,876.5Q753,920 690,920L402,920ZM447,480L447,70Q447,57.25 455.68,48.62Q464.35,40 477.18,40Q490,40 498.5,48.62Q507,57.25 507,70L507,480L447,480ZM614,480L614,110Q614,97.25 622.68,88.62Q631.35,80 644.18,80Q657,80 665.5,88.62Q674,97.25 674,110L674,480L614,480ZM473,670Q473,670 473,670Q473,670 473,670L473,670L473,670L473,670L473,670L473,670Q473,670 473,670Q473,670 473,670Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/search_48px.xml b/common/data/src/main/res/drawable/search_48px.xml
new file mode 100644
index 0000000..852066c
--- /dev/null
+++ b/common/data/src/main/res/drawable/search_48px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M796,839L533,576Q503,602 463.04,616.5Q423.08,631 378,631Q269.84,631 194.92,556Q120,481 120,375Q120,269 195,194Q270,119 376.5,119Q483,119 557.5,194Q632,269 632,375.15Q632,418 618,458Q604,498 576,533L840,795L796,839ZM377,571Q458.25,571 515.13,513.5Q572,456 572,375Q572,294 515.13,236.5Q458.25,179 377,179Q294.92,179 237.46,236.5Q180,294 180,375Q180,456 237.46,513.5Q294.92,571 377,571Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/settings_applications_48px.xml b/common/data/src/main/res/drawable/settings_applications_48px.xml
new file mode 100644
index 0000000..b4c399f
--- /dev/null
+++ b/common/data/src/main/res/drawable/settings_applications_48px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M452,674L508,674L518,620Q538,614 552,605Q566,596 578,584L640,603L666,549L619,519Q623,498 623,480Q623,462 619,441L666,411L640,357L578,376Q566,364 552,355Q538,346 518,340L508,286L452,286L442,340Q422,346 408,355Q394,364 382,376L320,357L294,411L341,441Q337,462 337,480Q337,498 341,519L294,549L320,603L382,584Q394,596 408,605Q422,614 442,620L452,674ZM480,565Q444,565 419.5,540.5Q395,516 395,480Q395,444 419.5,419.5Q444,395 480,395Q516,395 540.5,419.5Q565,444 565,480Q565,516 540.5,540.5Q516,565 480,565ZM180,840Q156,840 138,822Q120,804 120,780L120,180Q120,156 138,138Q156,120 180,120L780,120Q804,120 822,138Q840,156 840,180L840,780Q840,804 822,822Q804,840 780,840L180,840ZM180,780L780,780Q780,780 780,780Q780,780 780,780L780,180Q780,180 780,180Q780,180 780,180L180,180Q180,180 180,180Q180,180 180,180L180,780Q180,780 180,780Q180,780 180,780ZM180,180L180,180Q180,180 180,180Q180,180 180,180L180,780Q180,780 180,780Q180,780 180,780L180,780Q180,780 180,780Q180,780 180,780L180,180Q180,180 180,180Q180,180 180,180Z"/>
+</vector>
diff --git a/common/data/src/main/res/drawable/speed_camera_48px.xml b/common/data/src/main/res/drawable/speed_camera_48px.xml
new file mode 100644
index 0000000..952d15a
--- /dev/null
+++ b/common/data/src/main/res/drawable/speed_camera_48px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M715,592L647,553L772,460L840,499L715,592ZM518,493L648,397L333,219Q333,219 333,219Q333,219 333,219L258,346Q258,346 258,346Q258,346 258,346L518,493ZM453,356L453,356Q453,356 453,356Q453,356 453,356L453,356Q453,356 453,356Q453,356 453,356L453,356ZM160,800L160,740L370,740Q370,740 370,740Q370,740 370,740L370,478L228,398Q205.93,385.04 199.47,361.02Q193,337 206,315L281,190Q294,169 317.5,162.5Q341,156 362,168L757,391L522,564L430,512L430,740Q430,764.75 412.38,782.37Q394.75,800 370,800L160,800Z"/>
+</vector>
diff --git a/common/data/src/main/res/values/attrs.xml b/common/data/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..d6b0be2
--- /dev/null
+++ b/common/data/src/main/res/values/attrs.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+  <declare-styleable name="ShowcaseTheme">
+    <attr name="themedIconColor" format="color"/>
+    <attr name="markerIconTintColor" format="color"/>
+    <attr name="markerIconTintColorDark" format="color"/>
+  </declare-styleable>
+</resources>
diff --git a/common/data/src/main/res/values/strings.xml b/common/data/src/main/res/values/strings.xml
new file mode 100644
index 0000000..7bb0ec6
--- /dev/null
+++ b/common/data/src/main/res/values/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="speed_camera">Speed camera</string>
+    <string name="exit_action_title">Dismiss</string>
+    <string name="fuel_station">Gas station</string>
+    <string name="pharmacy">Pharmacy</string>
+    <string name="charging_station">Charging station</string>
+    <string name="category_title">Category</string>
+    <string name="on_action_title">On</string>
+    <string name="off_action_title">Off</string>
+    <string name="use_telephon_settings">Use telephon settings</string>
+    <string name="dark_mode">Dark mode</string>
+    <string name="display_settings">Display settings</string>
+    <string name="threed_building">3D building</string>
+    <string name="arrived_exclamation_msg">Arrived!</string>
+    <string name="drive_now">Drive now</string>
+    <string name="stop_action_title">Stop</string>
+    <string name="avoid_highways_row_title">Avoid highways</string>
+    <string name="avoid_tolls_row_title">Avoid tolls rows</string>
+    <string name="no_places">No places</string>
+    <string name="recent_destinations">Recent destination</string>
+    <string name="contacts">Contacts</string>
+    <string name="favorites">Favorites</string>
+    <string name="recent_Item_deleted">Recent item deleted</string>
+    <string name="route_preview">Route preview</string>
+    <string name="display">Display</string>
+    <string name="navigation_settings">Navigation settings</string>
+    <string name="settings_action_title">Settings</string>
+    <string name="accept_action_title">Accept</string>
+    <string name="reject_action_title">Reject</string>
+    <string name="ok_action_title">OK</string>
+    <string name="search_action_title">Search</string>
+</resources>
\ No newline at end of file
diff --git a/common/data/src/main/res/values/styles.xml b/common/data/src/main/res/values/styles.xml
new file mode 100644
index 0000000..d983543
--- /dev/null
+++ b/common/data/src/main/res/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+<style name="CarAppTheme">
+  <item name="themedIconColor">#FFFF0000</item>
+  <item name="carColorPrimary">#ff7f39fb</item>
+  <item name="carColorPrimaryDark">#5904DF</item>
+  <item name="carColorSecondary">#328E10</item>
+  <item name="carColorSecondaryDark">#1A6004</item>
+  <item name="markerIconTintColor">#FF7F39FB</item>
+  <item name="markerIconTintColorDark">#FF5904DF</item>
+</style>
+</resources>