diff --git a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/component/ErrorStateTest.kt b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/component/ErrorStateTest.kt
index 808113a3..c25a5eab 100644
--- a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/component/ErrorStateTest.kt
+++ b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/component/ErrorStateTest.kt
@@ -2,7 +2,6 @@ package dev.shorthouse.coinwatch.ui.component
 
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import dev.shorthouse.coinwatch.ui.theme.AppTheme
 import org.junit.Rule
@@ -24,7 +23,6 @@ class ErrorStateTest {
         }
 
         composeTestRule.apply {
-            onNodeWithContentDescription("Error").assertIsDisplayed()
             onNodeWithText("An error has occurred").assertIsDisplayed()
         }
     }
@@ -40,6 +38,7 @@ class ErrorStateTest {
         }
 
         composeTestRule.apply {
+            onNodeWithText("An error has occurred").assertIsDisplayed()
             onNodeWithText("Error message").assertIsDisplayed()
         }
     }
diff --git a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/MarketScreenTest.kt b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/MarketScreenTest.kt
index 8057e5ef..ff17e2c8 100644
--- a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/MarketScreenTest.kt
+++ b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/MarketScreenTest.kt
@@ -434,8 +434,8 @@ class MarketScreenTest {
         }
 
         composeTestRule.apply {
-            onNodeWithText("No coins").assertIsDisplayed()
-            onNodeWithText("Please try again later").assertIsDisplayed()
+            onNodeWithText("Couldn't load coins").assertIsDisplayed()
+            onNodeWithText("Check your internet connection").assertIsDisplayed()
         }
     }
 
diff --git a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SearchScreenTest.kt b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SearchScreenTest.kt
index e711bbe7..13dd1984 100644
--- a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SearchScreenTest.kt
+++ b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SearchScreenTest.kt
@@ -26,7 +26,7 @@ class SearchScreenTest {
     @Test
     fun when_uiStateError_should_showErrorMessage() {
         val uiState = SearchUiState(
-            errorMessage = "Error message"
+            errorMessage = "Unable to fetch coin search results"
         )
 
         composeTestRule.setContent {
@@ -42,7 +42,7 @@ class SearchScreenTest {
 
         composeTestRule.apply {
             onNodeWithText("An error has occurred").assertIsDisplayed()
-            onNodeWithText("Error message").assertIsDisplayed()
+            onNodeWithText("Unable to fetch coin search results").assertIsDisplayed()
         }
     }
 
@@ -90,6 +90,27 @@ class SearchScreenTest {
         }
     }
 
+    @Test
+    fun when_searchQueryIsEmpty_should_displayQueryEmptyState() {
+        val uiState = SearchUiState()
+
+        composeTestRule.setContent {
+            AppTheme {
+                SearchScreen(
+                    uiState = uiState,
+                    searchQuery = "",
+                    onSearchQueryChange = {},
+                    onCoinClick = {}
+                )
+            }
+        }
+
+        composeTestRule.apply {
+            onNodeWithText("Explore coins").assertIsDisplayed()
+            onNodeWithText("Search by name or symbol").assertIsDisplayed()
+        }
+    }
+
     @Test
     fun when_searchQueryEntered_should_displaySearchQuery() {
         val searchQuery = "Bitcoin"
@@ -134,6 +155,28 @@ class SearchScreenTest {
         }
     }
 
+    @Test
+    fun when_searchQueryEmpty_should_notDisplayClearSearchButton() {
+        val searchQuery = ""
+
+        val uiState = SearchUiState()
+
+        composeTestRule.setContent {
+            AppTheme {
+                SearchScreen(
+                    uiState = uiState,
+                    searchQuery = searchQuery,
+                    onSearchQueryChange = {},
+                    onCoinClick = {}
+                )
+            }
+        }
+
+        composeTestRule.apply {
+            onNodeWithContentDescription("Clear search").assertDoesNotExist()
+        }
+    }
+
     @Test
     fun when_clearSearchClicked_should_clearSearchQuery() {
         val searchQuery = mutableStateOf("Bitcoin")
@@ -206,7 +249,7 @@ class SearchScreenTest {
             AppTheme {
                 SearchScreen(
                     uiState = uiState,
-                    searchQuery = "",
+                    searchQuery = "Bit",
                     onSearchQueryChange = {},
                     onCoinClick = {}
                 )
@@ -240,7 +283,7 @@ class SearchScreenTest {
             AppTheme {
                 SearchScreen(
                     uiState = uiState,
-                    searchQuery = "",
+                    searchQuery = "Bit",
                     onSearchQueryChange = {},
                     onCoinClick = { onCoinClickCalled = true }
                 )
diff --git a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SettingsScreenTest.kt b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SettingsScreenTest.kt
index 6bba7351..6d002b7a 100644
--- a/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SettingsScreenTest.kt
+++ b/app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SettingsScreenTest.kt
@@ -1,12 +1,8 @@
 package dev.shorthouse.coinwatch.ui.screen
 
-import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.SemanticsProperties
 import androidx.compose.ui.test.SemanticsMatcher
-import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.assertIsNotSelected
-import androidx.compose.ui.test.assertIsSelected
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.isNotSelected
 import androidx.compose.ui.test.isSelected
@@ -42,7 +38,8 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
@@ -67,7 +64,8 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
@@ -88,7 +86,8 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
@@ -126,7 +125,8 @@ class SettingsScreenTest {
                     onNavigateUp = { onNavigateUpCalled = true },
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
@@ -139,8 +139,10 @@ class SettingsScreenTest {
     }
 
     @Test
-    fun when_startScreenClicked_should_openStartScreenDialog() {
-        val uiState = SettingsUiState()
+    fun when_currencyIsUsd_should_displayCurrencyAsUsd() {
+        val uiState = SettingsUiState(
+            currency = Currency.USD
+        )
 
         composeTestRule.setContent {
             AppTheme {
@@ -149,31 +151,23 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
-        val radioButtonMatcher = SemanticsMatcher.expectValue(
-            SemanticsProperties.Role,
-            Role.RadioButton
-        )
         composeTestRule.apply {
-            onNodeWithText("Start screen").performClick()
-            onNode(hasText("Market").and(radioButtonMatcher))
-                .assertIsDisplayed().assertHasClickAction()
-            onNode(hasText("Favourites").and(radioButtonMatcher))
-                .assertIsDisplayed().assertHasClickAction()
-            onNode(hasText("Search").and(radioButtonMatcher))
-                .assertIsDisplayed().assertHasClickAction()
+            onNodeWithText("Currency").assertIsDisplayed()
+            onNodeWithText("USD").assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_startScreenDialogOptionClicked_should_callOnUpdateStartScreen() {
-        val uiState = SettingsUiState()
-
-        var onUpdateStartScreenCalled = false
+    fun when_currencyIsGbp_should_displayCurrencyAsGbp() {
+        val uiState = SettingsUiState(
+            currency = Currency.GBP
+        )
 
         composeTestRule.setContent {
             AppTheme {
@@ -182,25 +176,22 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = { startScreen ->
-                        onUpdateStartScreenCalled = startScreen == StartScreen.Search
-                    }
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("Start screen").performClick()
-            onNodeWithText("Search").performClick()
+            onNodeWithText("Currency").assertIsDisplayed()
+            onNodeWithText("GBP").assertIsDisplayed()
         }
-
-        assertThat(onUpdateStartScreenCalled).isTrue()
     }
 
     @Test
-    fun when_startScreenIsMarket_should_haveMarketOptionSelected() {
+    fun when_currencyIsEur_should_displayCurrencyAsEur() {
         val uiState = SettingsUiState(
-            startScreen = StartScreen.Market
+            currency = Currency.EUR
         )
 
         composeTestRule.setContent {
@@ -210,32 +201,45 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
-        val radioButtonMatcher = SemanticsMatcher.expectValue(
-            SemanticsProperties.Role,
-            Role.RadioButton
-        )
         composeTestRule.apply {
-            onNodeWithText("Market").assertIsDisplayed()
-            onNodeWithText("Start screen").performClick()
+            onNodeWithText("Currency").assertIsDisplayed()
+            onNodeWithText("EUR").assertIsDisplayed()
+        }
+    }
 
-            onNode(hasText("Market").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsSelected()
-            onNode(hasText("Favourites").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsNotSelected()
-            onNode(hasText("Search").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsNotSelected()
+    @Test
+    fun when_currencySettingsClicked_should_callShowCurrencyBottomSheet() {
+        var showCurrencyBottomSheet = false
+        val uiState = SettingsUiState()
+
+        composeTestRule.setContent {
+            AppTheme {
+                SettingsScreen(
+                    uiState = uiState,
+                    onNavigateUp = {},
+                    onUpdateCurrency = {},
+                    onUpdateIsCurrencySheetShown = { showCurrencyBottomSheet = true },
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
+                )
+            }
         }
+
+        composeTestRule.onNodeWithText("Currency").performClick()
+        assertThat(showCurrencyBottomSheet).isTrue()
     }
 
     @Test
-    fun when_startScreenIsFavourites_should_haveFavouritesOptionSelected() {
+    fun when_currencyIsUsd_should_haveUsdSelectedInCurrencyBottomSheet() {
         val uiState = SettingsUiState(
-            startScreen = StartScreen.Favourites
+            currency = Currency.USD,
+            isCurrencySheetShown = true
         )
 
         composeTestRule.setContent {
@@ -245,32 +249,25 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
-        val radioButtonMatcher = SemanticsMatcher.expectValue(
-            SemanticsProperties.Role,
-            Role.RadioButton
-        )
         composeTestRule.apply {
-            onNodeWithText("Favourites").assertIsDisplayed()
-            onNodeWithText("Start screen").performClick()
-
-            onNode(hasText("Market").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsNotSelected()
-            onNode(hasText("Favourites").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsSelected()
-            onNode(hasText("Search").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsNotSelected()
+            onNodeWithText("Coin currency").assertIsDisplayed()
+            onNode(hasText("USD").and(isSelected())).assertIsDisplayed()
+            onNode(hasText("GBP").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("EUR").and(isNotSelected())).assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_startScreenIsSearch_should_haveSearchOptionSelected() {
+    fun when_currencyIsGbp_should_haveGbpSelectedInCurrencyBottomSheet() {
         val uiState = SettingsUiState(
-            startScreen = StartScreen.Search
+            currency = Currency.GBP,
+            isCurrencySheetShown = true
         )
 
         composeTestRule.setContent {
@@ -280,32 +277,82 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
-        val radioButtonMatcher = SemanticsMatcher.expectValue(
-            SemanticsProperties.Role,
-            Role.RadioButton
+        composeTestRule.apply {
+            onNodeWithText("Coin currency").assertIsDisplayed()
+            onNode(hasText("USD").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("GBP").and(isSelected())).assertIsDisplayed()
+            onNode(hasText("EUR").and(isNotSelected())).assertIsDisplayed()
+        }
+    }
+
+    @Test
+    fun when_currencyIsEur_should_haveEurSelectedInCurrencyBottomSheet() {
+        val uiState = SettingsUiState(
+            currency = Currency.EUR,
+            isCurrencySheetShown = true
         )
+
+        composeTestRule.setContent {
+            AppTheme {
+                SettingsScreen(
+                    uiState = uiState,
+                    onNavigateUp = {},
+                    onUpdateCurrency = {},
+                    onUpdateIsCurrencySheetShown = {},
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
+                )
+            }
+        }
+
         composeTestRule.apply {
-            onNodeWithText("Search").assertIsDisplayed()
-            onNodeWithText("Start screen").performClick()
+            onNodeWithText("Coin currency").assertIsDisplayed()
+            onNode(hasText("USD").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("GBP").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("EUR").and(isSelected())).assertIsDisplayed()
+        }
+    }
+
+    @Test
+    fun when_chooseCurrencyBottomSheetOption_should_callUpdateCurrency() {
+        var updateCurrencyCalled = false
+        val uiState = SettingsUiState(
+            currency = Currency.USD,
+            isCurrencySheetShown = true
+        )
+
+        composeTestRule.setContent {
+            AppTheme {
+                SettingsScreen(
+                    uiState = uiState,
+                    onNavigateUp = {},
+                    onUpdateCurrency = { currency ->
+                        updateCurrencyCalled = currency == Currency.GBP
+                    },
+                    onUpdateIsCurrencySheetShown = {},
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
+                )
+            }
+        }
 
-            onNode(hasText("Market").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsNotSelected()
-            onNode(hasText("Favourites").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsNotSelected()
-            onNode(hasText("Search").and(radioButtonMatcher))
-                .assertIsDisplayed().assertIsSelected()
+        composeTestRule.apply {
+            onNodeWithText("GBP").performClick()
         }
+
+        assertThat(updateCurrencyCalled).isTrue()
     }
 
     @Test
-    fun when_currencyIsUsd_should_displayCurrencyAsUsd() {
+    fun when_startScreenIsMarket_should_displayStartScreenAsMarket() {
         val uiState = SettingsUiState(
-            currency = Currency.USD
+            startScreen = StartScreen.Market
         )
 
         composeTestRule.setContent {
@@ -315,21 +362,22 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("Currency").assertIsDisplayed()
-            onNodeWithText("USD").assertIsDisplayed()
+            onNodeWithText("Start screen").assertIsDisplayed()
+            onNodeWithText("Market").assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_currencyIsGbp_should_displayCurrencyAsGbp() {
+    fun when_startScreenIsFavourites_should_displayStartScreenAsFavourites() {
         val uiState = SettingsUiState(
-            currency = Currency.GBP
+            startScreen = StartScreen.Favourites
         )
 
         composeTestRule.setContent {
@@ -339,21 +387,22 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("Currency").assertIsDisplayed()
-            onNodeWithText("GBP").assertIsDisplayed()
+            onNodeWithText("Start screen").assertIsDisplayed()
+            onNodeWithText("Favourites").assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_currencyIsEur_should_displayCurrencyAsEur() {
+    fun when_startScreenIsSearch_should_displayStartScreenAsSearch() {
         val uiState = SettingsUiState(
-            currency = Currency.EUR
+            startScreen = StartScreen.Search
         )
 
         composeTestRule.setContent {
@@ -363,21 +412,22 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("Currency").assertIsDisplayed()
-            onNodeWithText("EUR").assertIsDisplayed()
+            onNodeWithText("Start screen").assertIsDisplayed()
+            onNodeWithText("Search").assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_currencySettingsClicked_should_callShowCurrencyBottomSheet() {
-        var showCurrencyBottomSheet = false
+    fun when_startScreenSettingsClicked_should_callShowStartScreenBottomSheet() {
         val uiState = SettingsUiState()
+        var showStartScreenBottomSheet = false
 
         composeTestRule.setContent {
             AppTheme {
@@ -385,21 +435,25 @@ class SettingsScreenTest {
                     uiState = uiState,
                     onNavigateUp = {},
                     onUpdateCurrency = {},
-                    onUpdateIsCurrencySheetShown = { showCurrencyBottomSheet = true },
-                    onUpdateStartScreen = {}
+                    onUpdateIsCurrencySheetShown = {},
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = { showStartScreenBottomSheet = true }
                 )
             }
         }
 
-        composeTestRule.onNodeWithText("Currency").performClick()
-        assertThat(showCurrencyBottomSheet).isTrue()
+        composeTestRule.apply {
+            onNodeWithText("Start screen").performClick()
+        }
+
+        assertThat(showStartScreenBottomSheet).isTrue()
     }
 
     @Test
-    fun when_currencyIsUsd_should_haveUsdSelectedInCurrencyBottomSheet() {
+    fun when_startScreenIsMarket_should_haveMarketSelectedInStartScreenBottomSheet() {
         val uiState = SettingsUiState(
-            currency = Currency.USD,
-            isCurrencySheetShown = true
+            startScreen = StartScreen.Market,
+            isStartScreenSheetShown = true
         )
 
         composeTestRule.setContent {
@@ -409,24 +463,25 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("Coin currency").assertIsDisplayed()
-            onNode(hasText("USD").and(isSelected())).assertIsDisplayed()
-            onNode(hasText("GBP").and(isNotSelected())).assertIsDisplayed()
-            onNode(hasText("EUR").and(isNotSelected())).assertIsDisplayed()
+            onNodeWithText("App start screen").assertIsDisplayed()
+            onNode(hasText("Market").and(isSelected())).assertIsDisplayed()
+            onNode(hasText("Favourites").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("Search").and(isNotSelected())).assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_currencyIsGbp_should_haveGbpSelectedInCurrencyBottomSheet() {
+    fun when_startScreenIsFavourites_should_haveFavouritesSelectedInStartScreenBottomSheet() {
         val uiState = SettingsUiState(
-            currency = Currency.GBP,
-            isCurrencySheetShown = true
+            startScreen = StartScreen.Favourites,
+            isStartScreenSheetShown = true
         )
 
         composeTestRule.setContent {
@@ -436,24 +491,25 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("Coin currency").assertIsDisplayed()
-            onNode(hasText("USD").and(isNotSelected())).assertIsDisplayed()
-            onNode(hasText("GBP").and(isSelected())).assertIsDisplayed()
-            onNode(hasText("EUR").and(isNotSelected())).assertIsDisplayed()
+            onNodeWithText("App start screen").assertIsDisplayed()
+            onNode(hasText("Market").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("Favourites").and(isSelected())).assertIsDisplayed()
+            onNode(hasText("Search").and(isNotSelected())).assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_currencyIsEur_should_haveEurSelectedInCurrencyBottomSheet() {
+    fun when_startScreenIsSearch_should_haveSearchSelectedInStartScreenBottomSheet() {
         val uiState = SettingsUiState(
-            currency = Currency.EUR,
-            isCurrencySheetShown = true
+            startScreen = StartScreen.Search,
+            isStartScreenSheetShown = true
         )
 
         composeTestRule.setContent {
@@ -463,25 +519,26 @@ class SettingsScreenTest {
                     onNavigateUp = {},
                     onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = {},
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("Coin currency").assertIsDisplayed()
-            onNode(hasText("USD").and(isNotSelected())).assertIsDisplayed()
-            onNode(hasText("GBP").and(isNotSelected())).assertIsDisplayed()
-            onNode(hasText("EUR").and(isSelected())).assertIsDisplayed()
+            onNodeWithText("App start screen").assertIsDisplayed()
+            onNode(hasText("Market").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("Favourites").and(isNotSelected())).assertIsDisplayed()
+            onNode(hasText("Search").and(isSelected())).assertIsDisplayed()
         }
     }
 
     @Test
-    fun when_chooseCurrencyBottomSheetOption_should_callUpdateCurrency() {
-        var updateCurrencyCalled = false
+    fun when_chooseStartScreenBottomSheetOption_should_callUpdateStartScreen() {
+        var updateStartScreenCalled = false
         val uiState = SettingsUiState(
-            currency = Currency.USD,
-            isCurrencySheetShown = true
+            startScreen = StartScreen.Market,
+            isStartScreenSheetShown = true,
         )
 
         composeTestRule.setContent {
@@ -489,19 +546,20 @@ class SettingsScreenTest {
                 SettingsScreen(
                     uiState = uiState,
                     onNavigateUp = {},
-                    onUpdateCurrency = { currency ->
-                        updateCurrencyCalled = currency == Currency.GBP
-                    },
+                    onUpdateCurrency = {},
                     onUpdateIsCurrencySheetShown = {},
-                    onUpdateStartScreen = {}
+                    onUpdateStartScreen = { startScreen ->
+                        updateStartScreenCalled = startScreen == StartScreen.Favourites
+                    },
+                    onUpdateIsStartScreenSheetShown = {}
                 )
             }
         }
 
         composeTestRule.apply {
-            onNodeWithText("GBP").performClick()
+            onNodeWithText("Favourites").performClick()
         }
 
-        assertThat(updateCurrencyCalled).isTrue()
+        assertThat(updateStartScreenCalled).isTrue()
     }
 }
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/component/EmptyState.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/component/EmptyState.kt
index eae7dccb..5fa2b45b 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/component/EmptyState.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/component/EmptyState.kt
@@ -7,11 +7,9 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -38,16 +36,16 @@ fun EmptyState(
             verticalArrangement = Arrangement.Center,
             modifier = Modifier
                 .fillMaxWidth()
-                .fillMaxHeight(0.9f)
+                .fillMaxHeight(0.70f)
                 .padding(12.dp)
         ) {
             Image(
                 painter = image,
                 contentDescription = null,
-                modifier = Modifier.size(250.dp)
+                modifier = Modifier.height(180.dp)
             )
 
-            Spacer(Modifier.height(12.dp))
+            Spacer(Modifier.height(24.dp))
 
             Text(
                 text = title,
@@ -63,7 +61,7 @@ fun EmptyState(
 }
 
 @Composable
-@Preview
+@Preview(heightDp = 400)
 private fun EmptyStatePreview() {
     AppTheme {
         EmptyState(
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/component/ErrorState.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/component/ErrorState.kt
index be7dfa6d..cd03f1af 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/component/ErrorState.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/component/ErrorState.kt
@@ -1,75 +1,39 @@
 package dev.shorthouse.coinwatch.ui.component
 
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import dev.shorthouse.coinwatch.R
 import dev.shorthouse.coinwatch.ui.theme.AppTheme
 
 @Composable
 fun ErrorState(
     message: String?,
-    modifier: Modifier = Modifier,
+    modifier: Modifier = Modifier
 ) {
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
+    EmptyState(
+        image = painterResource(R.drawable.error_state),
+        title = stringResource(R.string.error_occurred),
+        subtitle = {
+            message?.let {
+                Text(
+                    text = it,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+        },
         modifier = modifier
-            .fillMaxWidth()
-            .fillMaxHeight(0.9f)
-            .padding(12.dp)
-            .background(MaterialTheme.colorScheme.background)
-    ) {
-        Image(
-            painter = painterResource(R.drawable.error_state),
-            contentDescription = stringResource(R.string.cd_error_state),
-            modifier = Modifier.size(250.dp)
-        )
-
-        Spacer(Modifier.height(12.dp))
-
-        Text(
-            text = stringResource(R.string.error_occurred),
-            style = MaterialTheme.typography.titleMedium,
-            color = MaterialTheme.colorScheme.onBackground
-        )
-
-        Spacer(Modifier.height(4.dp))
-
-        message?.let {
-            Text(
-                text = it,
-                style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-        }
-
-        Spacer(Modifier.height(24.dp))
-    }
+    )
 }
 
 @Composable
-@Preview
-private fun ErrorStateRetryPreview() {
+@Preview(heightDp = 400)
+private fun ErrorStatePreview() {
     AppTheme {
         ErrorState(
             message = "No internet connection",
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/FavouritesScreen.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/FavouritesScreen.kt
index 4dea930a..12732c7a 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/FavouritesScreen.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/FavouritesScreen.kt
@@ -255,14 +255,15 @@ fun FavouritesContent(
     CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
         when {
             favouriteCoins.isEmpty() -> {
-                FavouritesEmptyState(modifier = modifier.padding(12.dp))
+                FavouritesEmptyState()
             }
 
             isFavouritesCondensed -> {
                 FavouritesCondensedList(
                     favouriteCoins = favouriteCoins,
                     onCoinClick = onCoinClick,
-                    listState = listState
+                    listState = listState,
+                    modifier = modifier
                 )
             }
 
@@ -270,7 +271,8 @@ fun FavouritesContent(
                 FavouritesList(
                     favouriteCoins = favouriteCoins,
                     onCoinClick = onCoinClick,
-                    gridState = gridState
+                    gridState = gridState,
+                    modifier = modifier
                 )
             }
         }
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/component/FavouritesEmptyState.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/component/FavouritesEmptyState.kt
index fcc4a62b..9b7088d9 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/component/FavouritesEmptyState.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/favourites/component/FavouritesEmptyState.kt
@@ -22,7 +22,7 @@ import dev.shorthouse.coinwatch.ui.theme.AppTheme
 @Composable
 fun FavouritesEmptyState(modifier: Modifier = Modifier) {
     EmptyState(
-        image = painterResource(R.drawable.empty_state_favourite_coins),
+        image = painterResource(R.drawable.empty_state_favourites),
         title = stringResource(R.string.empty_state_favourite_coins_title),
         subtitle = {
             Row(verticalAlignment = Alignment.CenterVertically) {
@@ -38,7 +38,7 @@ fun FavouritesEmptyState(modifier: Modifier = Modifier) {
                     tint = MaterialTheme.colorScheme.onSurfaceVariant,
                     modifier = Modifier
                         .size(22.dp)
-                        .padding(start = 2.dp, top = 2.dp, end = 2.dp)
+                        .padding(start = 4.dp, top = 2.dp, end = 4.dp)
                 )
 
                 Text(
@@ -53,7 +53,7 @@ fun FavouritesEmptyState(modifier: Modifier = Modifier) {
 }
 
 @Composable
-@Preview
+@Preview(heightDp = 400)
 private fun FavouritesEmptyStatePreview() {
     AppTheme {
         FavouritesEmptyState()
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/MarketScreen.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/MarketScreen.kt
index 2d898c39..d7d3753c 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/MarketScreen.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/MarketScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -64,9 +65,9 @@ import dev.shorthouse.coinwatch.ui.component.pullrefresh.rememberPullRefreshStat
 import dev.shorthouse.coinwatch.ui.model.TimeOfDay
 import dev.shorthouse.coinwatch.ui.previewdata.MarketUiStatePreviewProvider
 import dev.shorthouse.coinwatch.ui.screen.market.component.CoinSortBottomSheet
+import dev.shorthouse.coinwatch.ui.screen.market.component.CoinsEmptyState
 import dev.shorthouse.coinwatch.ui.screen.market.component.MarketChip
 import dev.shorthouse.coinwatch.ui.screen.market.component.MarketCoinItem
-import dev.shorthouse.coinwatch.ui.screen.market.component.MarketEmptyState
 import dev.shorthouse.coinwatch.ui.screen.market.component.SearchPrompt
 import dev.shorthouse.coinwatch.ui.theme.AppTheme
 import kotlinx.collections.immutable.ImmutableList
@@ -306,48 +307,50 @@ fun MarketContent(
     lazyListState: LazyListState,
     modifier: Modifier = Modifier
 ) {
-    Column(modifier = modifier.padding(horizontal = 12.dp)) {
-        if (coins.isEmpty()) {
-            MarketEmptyState()
-        } else {
-            LazyColumn(state = lazyListState) {
-                item {
-                    MarketChip(
-                        label = stringResource(coinSort.nameId),
-                        onClick = { onUpdateIsCoinSortSheetShown(true) }
-                    )
-                }
-                items(
-                    count = coins.size,
-                    key = { coins[it].id },
-                    itemContent = { index ->
-                        val coinListItem = coins[index]
-
-                        val cardShape = when (index) {
-                            0 -> MaterialTheme.shapes.medium.copy(
-                                bottomStart = CornerSize(0.dp),
-                                bottomEnd = CornerSize(0.dp)
-                            )
-
-                            coins.lastIndex -> MaterialTheme.shapes.medium.copy(
-                                topStart = CornerSize(0.dp),
-                                topEnd = CornerSize(0.dp)
-                            )
+    if (coins.isEmpty()) {
+        CoinsEmptyState()
+    } else {
+        LazyColumn(
+            state = lazyListState,
+            contentPadding = PaddingValues(start = 12.dp, end = 12.dp),
+            modifier = modifier
+        ) {
+            item {
+                MarketChip(
+                    label = stringResource(coinSort.nameId),
+                    onClick = { onUpdateIsCoinSortSheetShown(true) }
+                )
+            }
+            items(
+                count = coins.size,
+                key = { coins[it].id },
+                itemContent = { index ->
+                    val coinListItem = coins[index]
 
-                            else -> RoundedCornerShape(0.dp)
-                        }
+                    val cardShape = when (index) {
+                        0 -> MaterialTheme.shapes.medium.copy(
+                            bottomStart = CornerSize(0.dp),
+                            bottomEnd = CornerSize(0.dp)
+                        )
 
-                        MarketCoinItem(
-                            coin = coinListItem,
-                            onCoinClick = { onCoinClick(coinListItem) },
-                            cardShape = cardShape
+                        coins.lastIndex -> MaterialTheme.shapes.medium.copy(
+                            topStart = CornerSize(0.dp),
+                            topEnd = CornerSize(0.dp)
                         )
+
+                        else -> RoundedCornerShape(0.dp)
                     }
-                )
 
-                item {
-                    SearchPrompt(modifier = Modifier.padding(vertical = 12.dp))
+                    MarketCoinItem(
+                        coin = coinListItem,
+                        onCoinClick = { onCoinClick(coinListItem) },
+                        cardShape = cardShape
+                    )
                 }
+            )
+
+            item {
+                SearchPrompt(modifier = Modifier.padding(vertical = 12.dp))
             }
         }
     }
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/component/MarketEmptyState.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/component/CoinsEmptyState.kt
similarity index 87%
rename from app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/component/MarketEmptyState.kt
rename to app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/component/CoinsEmptyState.kt
index e5eebfe1..726f963c 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/component/MarketEmptyState.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/market/component/CoinsEmptyState.kt
@@ -12,7 +12,7 @@ import dev.shorthouse.coinwatch.ui.component.EmptyState
 import dev.shorthouse.coinwatch.ui.theme.AppTheme
 
 @Composable
-fun MarketEmptyState(modifier: Modifier = Modifier) {
+fun CoinsEmptyState(modifier: Modifier = Modifier) {
     EmptyState(
         image = painterResource(R.drawable.empty_state_coins),
         title = stringResource(R.string.empty_state_coins_title),
@@ -28,9 +28,9 @@ fun MarketEmptyState(modifier: Modifier = Modifier) {
 }
 
 @Composable
-@Preview
-private fun MarketEmptyStatePreview() {
+@Preview(heightDp = 400)
+private fun CoinsEmptyStatePreview() {
     AppTheme {
-        MarketEmptyState()
+        CoinsEmptyState()
     }
 }
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/SearchScreen.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/SearchScreen.kt
index 1aee6807..28057f6b 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/SearchScreen.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/SearchScreen.kt
@@ -18,11 +18,9 @@ import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -33,8 +31,9 @@ import dev.shorthouse.coinwatch.model.SearchCoin
 import dev.shorthouse.coinwatch.ui.component.ErrorState
 import dev.shorthouse.coinwatch.ui.component.LoadingIndicator
 import dev.shorthouse.coinwatch.ui.previewdata.SearchUiStatePreviewProvider
-import dev.shorthouse.coinwatch.ui.screen.search.component.SearchEmptyState
 import dev.shorthouse.coinwatch.ui.screen.search.component.SearchListItem
+import dev.shorthouse.coinwatch.ui.screen.search.component.SearchQueryEmptyState
+import dev.shorthouse.coinwatch.ui.screen.search.component.SearchResultsEmptyState
 import dev.shorthouse.coinwatch.ui.theme.AppTheme
 import kotlinx.collections.immutable.ImmutableList
 
@@ -57,7 +56,7 @@ fun SearchScreen(
     )
 }
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SearchScreen(
     uiState: SearchUiState,
@@ -113,11 +112,15 @@ fun SearchScreen(
             }
 
             uiState.errorMessage != null -> {
-                ErrorState(message = uiState.errorMessage)
+                ErrorState(
+                    message = uiState.errorMessage,
+                    modifier = Modifier.padding(bottom = 12.dp)
+                )
             }
 
             else -> {
                 SearchContent(
+                    searchQuery = searchQuery,
                     searchResults = uiState.searchResults,
                     queryHasNoResults = uiState.queryHasNoResults,
                     onCoinClick = onCoinClick
@@ -129,45 +132,57 @@ fun SearchScreen(
 
 @Composable
 fun SearchContent(
+    searchQuery: String,
     searchResults: ImmutableList<SearchCoin>,
     queryHasNoResults: Boolean,
     onCoinClick: (SearchCoin) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    if (queryHasNoResults) {
-        SearchEmptyState(modifier = modifier.padding(12.dp))
-    } else {
-        LazyColumn(contentPadding = PaddingValues(12.dp)) {
-            items(
-                count = searchResults.size,
-                key = { index -> searchResults[index].id },
-                itemContent = { index ->
-                    val searchCoin = searchResults[index]
-
-                    val cardShape = when {
-                        searchResults.size == 1 -> MaterialTheme.shapes.medium
-
-                        index == 0 -> MaterialTheme.shapes.medium.copy(
-                            bottomStart = CornerSize(0.dp),
-                            bottomEnd = CornerSize(0.dp)
-                        )
+    when {
+        searchQuery.isEmpty() -> {
+            SearchQueryEmptyState()
+        }
 
-                        index == searchResults.lastIndex ->
-                            MaterialTheme.shapes.medium.copy(
-                                topStart = CornerSize(0.dp),
-                                topEnd = CornerSize(0.dp)
+        queryHasNoResults -> {
+            SearchResultsEmptyState()
+        }
+
+        else -> {
+            LazyColumn(
+                contentPadding = PaddingValues(12.dp),
+                modifier = modifier
+            ) {
+                items(
+                    count = searchResults.size,
+                    key = { index -> searchResults[index].id },
+                    itemContent = { index ->
+                        val searchCoin = searchResults[index]
+
+                        val cardShape = when {
+                            searchResults.size == 1 -> MaterialTheme.shapes.medium
+
+                            index == 0 -> MaterialTheme.shapes.medium.copy(
+                                bottomStart = CornerSize(0.dp),
+                                bottomEnd = CornerSize(0.dp)
                             )
 
-                        else -> RoundedCornerShape(0.dp)
-                    }
+                            index == searchResults.lastIndex ->
+                                MaterialTheme.shapes.medium.copy(
+                                    topStart = CornerSize(0.dp),
+                                    topEnd = CornerSize(0.dp)
+                                )
 
-                    SearchListItem(
-                        searchCoin = searchCoin,
-                        onCoinClick = onCoinClick,
-                        cardShape = cardShape
-                    )
-                }
-            )
+                            else -> RoundedCornerShape(0.dp)
+                        }
+
+                        SearchListItem(
+                            searchCoin = searchCoin,
+                            onCoinClick = onCoinClick,
+                            cardShape = cardShape
+                        )
+                    }
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchEmptyState.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchQueryEmptyState.kt
similarity index 71%
rename from app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchEmptyState.kt
rename to app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchQueryEmptyState.kt
index 7feb0582..9034a391 100644
--- a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchEmptyState.kt
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchQueryEmptyState.kt
@@ -1,5 +1,6 @@
 package dev.shorthouse.coinwatch.ui.screen.search.component
 
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -7,14 +8,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import dev.shorthouse.coinwatch.R
 import dev.shorthouse.coinwatch.ui.component.EmptyState
 import dev.shorthouse.coinwatch.ui.theme.AppTheme
 
 @Composable
-fun SearchEmptyState(modifier: Modifier = Modifier) {
+fun SearchQueryEmptyState(modifier: Modifier = Modifier) {
     EmptyState(
-        image = painterResource(R.drawable.empty_state_search),
+        image = painterResource(R.drawable.empty_state_search_query),
         title = stringResource(R.string.empty_state_search_title),
         subtitle = {
             Text(
@@ -23,14 +25,14 @@ fun SearchEmptyState(modifier: Modifier = Modifier) {
                 color = MaterialTheme.colorScheme.onSurfaceVariant
             )
         },
-        modifier = modifier
+        modifier = modifier.padding(bottom = 12.dp)
     )
 }
 
 @Composable
-@Preview
-private fun SearchEmptyStatePreview() {
+@Preview(heightDp = 400)
+private fun SearchQueryEmptyStatePreview() {
     AppTheme {
-        SearchEmptyState()
+        SearchQueryEmptyState()
     }
 }
diff --git a/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchResultsEmptyState.kt b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchResultsEmptyState.kt
new file mode 100644
index 00000000..539bec06
--- /dev/null
+++ b/app/src/main/java/dev/shorthouse/coinwatch/ui/screen/search/component/SearchResultsEmptyState.kt
@@ -0,0 +1,39 @@
+package dev.shorthouse.coinwatch.ui.screen.search.component
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import dev.shorthouse.coinwatch.R
+import dev.shorthouse.coinwatch.ui.component.EmptyState
+import dev.shorthouse.coinwatch.ui.theme.AppTheme
+
+
+@Composable
+fun SearchResultsEmptyState(modifier: Modifier = Modifier) {
+    EmptyState(
+        image = painterResource(R.drawable.empty_state_search_results),
+        title = stringResource(R.string.empty_state_search_results_title),
+        subtitle = {
+            Text(
+                text = stringResource(R.string.empty_state_search_results_subtitle),
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        },
+        modifier = modifier.padding(bottom = 12.dp)
+    )
+}
+
+@Composable
+@Preview(heightDp = 400)
+private fun SearchResultsEmptyStatePreview() {
+    AppTheme {
+        SearchResultsEmptyState()
+    }
+}
diff --git a/app/src/main/res/drawable/empty_state_coins.xml b/app/src/main/res/drawable/empty_state_coins.xml
index 50a9e523..473c12f3 100644
--- a/app/src/main/res/drawable/empty_state_coins.xml
+++ b/app/src/main/res/drawable/empty_state_coins.xml
@@ -1,114 +1,67 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="423.88dp"
-    android:height="532.8dp"
-    android:viewportWidth="423.88"
-    android:viewportHeight="532.8">
-    <path
-        android:pathData="M95.53,514.52l8.39,3.57l17.78,-30.65l-12.38,-5.27l-13.79,32.35z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M164.84,522.46l9.12,-0l4.34,-35.17l-13.46,0l0,35.17z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M164.52,531.97l28.04,-0L192.56,531.62a10.91,10.91 0,0 0,-10.91 -10.91h-0l-5.12,-3.89 -9.56,3.89 -2.45,0Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M90.43,520.61 L116.22,531.6l0.14,-0.33a10.91,10.91 0,0 0,-5.76 -14.32l-0,-0 -3.19,-5.58 -10.31,-0.17 -2.25,-0.96Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M173.78,314.32 L187.64,398.7l-3.77,12.57 4.95,8.9 -7.27,78.2 2.95,6.49 -8.24,5.08L159.49,509.96l-0.89,-70.8 -4.14,-10.39L154.45,423.04l-8.43,-43.17 -0.9,53.61 -2.69,5.19 -24.12,63.14L99.51,501.81l1.45,-11.2h0c-3.37,-1.71 5.06,-6.69 5.87,-10.38l-2.77,-6.23 2.77,-11.77 6.38,-32.73 -6.52,-38.81 2.33,-24.98 -1.22,-8.54 0.09,-2.76s3.21,-1.24 0.14,-4.34c-4.25,-24.09 0.98,-29.32 0.98,-29.32L129.95,308.5Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M140.04,184.2m-19,0a19,19 0,1 1,38.01 0a19,19 0,1 1,-38.01 0"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M116.21,147.75a7.48,7.48 0,0 1,-8.16 8.06l-11.04,24.17 -7.33,-11.71 11.61,-21.16a7.52,7.52 0,0 1,14.92 0.64Z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M175.03,316.14a1.79,1.79 0,0 1,-2.15 1.99c-9.95,-2.15 -51.01,3.01 -64.61,16.87a1.8,1.8 0,0 1,-3.08 -1.39c0.24,-2.98 4.57,-16.46 4.57,-16.46l1.32,-8.4a1.95,1.95 0,0 0,0 -0.59l-1.21,-6.95a1.82,1.82 0,0 0,-0.5 -0.96l-0.41,-0.41a1.8,1.8 0,0 1,0 -2.54l1.59,-1.58a1.84,1.84 0,0 0,0.51 -1.51l-2.11,-15.6c-0.01,-0.03 -0.01,-0.07 -0.02,-0.1l-9.32,-49.22a1.8,1.8 0,0 1,0.99 -1.95l15.84,-7.57a1.77,1.77 0,0 0,0.45 -0.3l11.06,-10.26a1.85,1.85 0,0 1,1.2 -0.48l19.88,-0.15a1.81,1.81 0,0 1,1.43 0.7l6.05,7.87a1.79,1.79 0,0 0,0.84 0.6l4.1,1.39 11.84,4.02 0.55,0.19a1.78,1.78 0,0 1,1.2 1.62,0.86 0.86,0 0,1 0.01,0.16l-2.96,61.26a1.94,1.94 0,0 0,0.14 0.79l1.42,3.31a1.8,1.8 0,0 1,-0.41 2c-0.42,0.4 -0.9,0.86 -1.2,1.2 -0.61,0.67 0.69,5.98 0.89,6.75a1.41,1.41 0,0 1,0.04 0.2l0.73,5.49a1.78,1.78 0,0 1,-0.74 1.69,1.79 1.79,0 0,0 -0.32,2.62l1.6,1.89a1.91,1.91 0,0 1,0.41 0.93Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M135.18,202.28q-0.12,-0.27 -0.24,-0.54c0.03,0 0.06,0.01 0.09,0.01Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M202.84,309.89a7.48,7.48 0,0 0,-8.14 -8.08l-10.98,-24.2 -7.36,11.69 11.55,21.19a7.52,7.52 0,0 0,14.92 -0.6Z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M187.96,284.48l-0.61,1.14 -6.43,12.02 -0.9,1.68 -6.28,-8.65 -20.61,-28.38 2.93,-17.8 5.39,-22.3 7.99,-0.46 5.6,2.29h0a11.5,11.5 0,0 1,6.64 12.72L176.72,262.14Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M156.58,167.1a10.7,10.7 0,0 0,-1.86 -4.37,5.23 5.23,0 0,0 -7.79,-0.24 5.73,5.73 0,0 0,0.25 -2.69,14.57 14.57,0 0,1 -4.4,1.31l3.37,-3.52 -16.79,1.54c-1.73,0.16 -3.61,0.38 -4.88,1.7 -1.27,1.32 -1.34,4.13 0.27,4.86 -3.17,-1.19 -6.81,0.54 -8.9,3.44 -2.09,2.9 -2.86,6.73 -3,10.44 -0.18,4.82 0.71,9.94 3.65,13.49 1.92,2.32 4.54,3.76 6.67,5.85l0.06,0.06a18.91,18.91 0,0 0,18.3 5.1c0.36,-0.1 0.72,-0.21 1.08,-0.31 1.81,0.82 4.06,-0.3 5.2,-2.12 1.22,-1.94 1.46,-4.42 1.51,-6.79a55.63,55.63 0,0 0,-0.57 -9.24c-0.5,-3.45 -0.96,-7.86 1.77,-9.59 2.13,-1.35 4.77,-0.02 6.9,1.3A35.53,35.53 0,0 0,156.58 167.1Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M116.06,255.08l-12.66,-0.91 -21.98,-26.91L65.11,203.88l3.76,-9.51 17.76,-25.44L86.44,166.73l1.97,-0.35 0.03,-2.65 1.63,0.26L94.44,157.73l10,8 -5.66,16.61L98.44,185.73l-1.96,3.37 0.96,4.63 -3.74,3.55 -1.8,5.29c7.77,5.11 15.13,12.75 22.32,22.32Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M288.64,284.34l-1.37,12.73l0.81,16.69l-36.98,-4.39l-3.47,-25.03l4.43,0.04l36.59,-0.04z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M256.44,242.5l8.79,-5.27 4.21,-6.5 13,2 15.89,10.65 -0.16,24.16 -9.85,25.06 -41.3,-5.27 -1.57,-8.84s-11.42,-15.34 0.88,-24.13Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M203.7,170.76a6.71,6.71 0,0 0,4.34 9.33l28.61,53.98L248.19,225.15l-31.75,-50.25a6.74,6.74 0,0 0,-12.74 -4.14Z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M250.63,252.3s-2.65,2.35 -6.42,-4.14c-3.02,-5.2 -18.07,-28.47 -20.2,-36.54a5.27,5.27 0,0 1,-5.21 -3.81l16.17,-6.28c3.51,1.76 2.54,4.19 1.65,5.45l6.02,9.03 20.03,22.48 -10.08,12.14Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M307.81,515.48l-8.08,0l-3.85,-31.18l11.93,0l0,31.18z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M312.08,529.48h-5.8l-1.03,-5.47 -2.65,5.47h-15.38a3.46,3.46 0,0 1,-1.96 -6.3l12.28,-8.48v-5.53l12.92,0.77Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M262.4,515.48l-8.08,0l-3.85,-31.18l11.93,0l0,31.18z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M266.67,529.48L260.87,529.48l-1.03,-5.47 -2.65,5.47L241.81,529.48a3.46,3.46 0,0 1,-1.96 -6.3l12.28,-8.48v-5.53l12.92,0.77Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M311.3,488.59h-0.09l-1.55,-50.7a13.26,13.26 0,0 0,-0.17 -12.53l-0.22,-0.4 0.58,-2.68a17.04,17.04 0,0 0,-0.97 -10.26l-1.45,-47.29c5.18,-33.58 -19.51,-55.48 -19.51,-55.48L250.91,309.25l-2.64,9.08L245.44,320.73l1.07,3.63L243.44,328.73l-0.47,7.8c-5.25,51.15 -4.3,101 4.03,149.29l-0.23,0.11a1.92,1.92 0,0 0,-0.78 2.53c0.38,1.12 1.36,1.79 2.18,1.51l19.54,-0.68a1.92,1.92 0,0 0,0.78 -2.53c-0.38,-1.12 -1.36,-1.79 -2.18,-1.51l-1.33,0.67 2.83,-48.92 -0.31,-8.94 0.65,-10.14 2.99,-45.6 11.34,56.08 11.58,60.74a2.13,2.13 0,0 0,1.44 3.71h15.81a2.14,2.14 0,0 0,0 -4.27Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M351.82,330.11a6.71,6.71 0,0 0,-4.61 -9.2L317.04,267.79l-11.28,9.24 33.2,49.31a6.74,6.74 0,0 0,12.85 3.76Z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M295.81,243.35s2.58,-2.43 6.54,3.95c3.17,5.11 25.61,34.55 27.97,42.55a5.27,5.27 0,0 1,5.32 3.66l-15.98,6.74c-3.56,-1.65 -5.22,-4.75 -4.37,-6.03L309.02,285.37l-23.55,-27.19 8.45,-13.11Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M415.22,531.25a1.55,1.55 0,0 1,-1.55 1.55L1.62,532.8a1.55,1.55 0,0 1,0 -3.11L413.67,529.7A1.55,1.55 0,0 1,415.22 531.25Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M263.12,195.67c-5.38,10.6 -1.87,22.88 8.12,29.34 10.79,6.98 24.81,5.45 29.34,-8.12 5.05,-15.11 0.9,-21.6 -8.12,-29.34C281.89,178.47 268.93,184.21 263.12,195.67Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M289.6,219.29a17.03,17.03 0,0 1,-27.1 -20.64l0.15,-0.19a17.03,17.03 0,0 1,26.95 20.83Z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M257.91,193.95a23.27,23.27 0,0 0,9.82 5.57,10.18 10.18,0 0,1 2.59,-2.15 10.89,10.89 0,0 0,-0.95 3.07c1.64,3.41 8.35,5.86 14.76,8.36L292.62,193.83l-11.24,-6.37C272.35,181.22 261.72,183.88 257.91,193.95Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M299.02,187.57a5.23,5.23 0,0 1,4.95 0.72,11.03 11.03,0 0,1 3.23,3.93 28.17,28.17 0,0 1,2.93 7.98c0.48,2.42 0.4,5.34 -1.77,6.6 -1.81,1.05 -4.4,0.39 -6.06,-1.01a13.46,13.46 0,0 1,-3.41 -5.31,18.75 18.75,0 0,0 -3.02,-5.53l1.5,0.7a13.09,13.09 0,0 1,-0.65 -4.46A4.32,4.32 0,0 1,299.02 187.57Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M279.59,189.53l12.06,6.83a14.13,14.13 0,0 1,5.33 19.26l0,0a21.93,21.93 0,0 1,-28.04 9.2l11.02,-9.73 -14.94,7.61 -3.19,-1.81C277.84,217.99 280.93,205.42 279.59,189.53Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M163.16,0l-39.66,66.03l39.8,23.5l-0.13,-89.53z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M203,66.03l-39.84,-66.03l0.13,89.53l39.7,-23.5z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M123.5,66.03l39.75,-18.12l0.05,41.61l-39.8,-23.5z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M203,66.03l-39.75,-18.12l0.09,40.09l39.66,-21.98z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M202.9,73.6l-39.7,23.5l0,32.41l39.7,-55.9z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M123.5,73.6l39.7,23.5l0,32.41l-39.7,-55.9z"
-        android:fillColor="@color/surface" />
+    android:width="797.5dp"
+    android:height="834.5dp"
+    android:viewportWidth="797.5"
+    android:viewportHeight="834.5">
+  <path
+      android:pathData="M0,780a308.5,54.5 0,1 0,617 0a308.5,54.5 0,1 0,-617 0z"
+      android:fillColor="@color/primary_container"/>
+  <path
+      android:pathData="M496,301.5m-301.5,0a301.5,301.5 0,1 1,603 0a301.5,301.5 0,1 1,-603 0"
+      android:fillColor="@color/primary_container"/>
+  <path
+      android:fillColor="@color/black"
+      android:pathData="M496,301.5m-248.9,0a248.9,248.9 0,1 1,497.8 0a248.9,248.9 0,1 1,-497.8 0"
+      android:strokeAlpha="0.05"
+      android:fillAlpha="0.05"/>
+  <path
+      android:fillColor="@color/black"
+      android:pathData="M496,301.5m-203.99,0a203.99,203.99 0,1 1,407.99 0a203.99,203.99 0,1 1,-407.99 0"
+      android:strokeAlpha="0.05"
+      android:fillAlpha="0.05"/>
+  <path
+      android:fillColor="@color/black"
+      android:pathData="M496,301.5m-146.26,0a146.26,146.26 0,1 1,292.52 0a146.26,146.26 0,1 1,-292.52 0"
+      android:strokeAlpha="0.05"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M197.17,328.48s-23.7,66.72 -13.17,90.43 27.22,46.53 27.22,46.53S205.07,332.87 197.17,328.48Z"
+      android:fillColor="@color/drawable_lighter"/>
+  <path
+      android:fillColor="@color/drawable_darker"
+      android:pathData="M197.17,328.48s-23.7,66.72 -13.17,90.43 27.22,46.53 27.22,46.53S205.07,332.87 197.17,328.48Z"
+      android:strokeAlpha="0.1"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M213.85,483s-1.76,16.68 -2.63,17.56 0.88,2.63 0,5.27 -1.76,6.15 0,7.02 -9.66,78.14 -9.66,78.14 -28.09,36.87 -16.68,94.82l3.51,58.82s27.22,1.76 27.22,-7.9c0,0 -1.76,-11.41 -1.76,-16.68s4.39,-5.27 1.76,-7.9 -2.63,-4.39 -2.63,-4.39 4.39,-3.51 3.51,-4.39 7.9,-63.21 7.9,-63.21 9.66,-9.66 9.66,-14.92v-5.27s4.39,-11.41 4.39,-12.29 23.7,-54.43 23.7,-54.43l9.66,38.63 10.54,55.31s5.27,50.04 15.8,69.36c0,0 18.44,63.21 18.44,61.45s30.73,-6.15 29.85,-14.05 -18.44,-118.52 -18.44,-118.52L332.37,481.24Z"
+      android:fillColor="@color/drawable_darker"/>
+  <path
+      android:pathData="M190.15,740.23s-23.7,46.53 -7.9,48.29 21.95,1.76 28.97,-5.27c3.84,-3.84 11.62,-8.99 17.88,-12.87a23.12,23.12 0,0 0,10.97 -21.98c-0.46,-4.3 -2.07,-7.83 -6.02,-8.16 -10.54,-0.88 -22.83,-10.54 -22.83,-10.54Z"
+      android:fillColor="@color/drawable_darker"/>
+  <path
+      android:pathData="M320.96,774.47s-23.7,46.53 -7.9,48.29 21.95,1.76 28.97,-5.27c3.84,-3.84 11.62,-8.99 17.88,-12.87a23.12,23.12 0,0 0,10.97 -21.98c-0.46,-4.3 -2.07,-7.83 -6.02,-8.16 -10.54,-0.88 -22.83,-10.54 -22.83,-10.54Z"
+      android:fillColor="@color/drawable_darker"/>
+  <path
+      android:pathData="M295.9,215.43m-36.9,0a36.9,36.9 0,1 1,73.81 0a36.9,36.9 0,1 1,-73.81 0"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M272.18,227.56S245.82,276.06 243.71,276.06 291.16,291.88 291.16,291.88s13.71,-46.39 15.82,-50.61Z"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M312.62,280.64s-52.68,-28.97 -57.94,-28.09 -61.45,50.04 -60.58,70.23 7.9,53.55 7.9,53.55 2.63,93.06 7.9,93.94 -0.88,16.68 0.88,16.68 122.91,0 123.79,-2.63S312.62,280.64 312.62,280.64Z"
+      android:fillColor="@color/drawable_lighter"/>
+  <path
+      android:pathData="M342.03,489.14s16.68,50.92 2.63,49.16 -20.19,-43.9 -20.19,-43.9Z"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M297.25,277.56s-32.48,7.02 -27.22,50.92 14.92,87.79 14.92,87.79l32.48,71.11 3.51,13.17 23.7,-6.15L327.1,392.57s-6.15,-108.86 -14.05,-112.37A34,34 0,0 0,297.25 277.56Z"
+      android:fillColor="@color/drawable_lighter"/>
+  <path
+      android:fillColor="@color/drawable_darker"
+      android:pathData="M277.5,414.96l40.39,71.99l-34.03,-75.86l-6.36,3.87z"
+      android:strokeAlpha="0.1"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M332.65,204.57l0.12,-2.82 5.61,1.4a6.27,6.27 0,0 0,-2.51 -4.62l5.98,-0.33a64.48,64.48 0,0 0,-43.12 -26.65c-12.93,-1.87 -27.32,0.84 -36.18,10.43 -4.3,4.65 -7,10.57 -8.92,16.61 -3.54,11.12 -4.26,24.37 3.12,33.41 7.5,9.19 20.6,10.98 32.41,12.12 4.15,0.4 8.51,0.77 12.35,-0.84a29.72,29.72 0,0 0,-1.65 -13.04,8.69 8.69,0 0,1 -0.88,-4.15c0.52,-3.51 5.21,-4.4 8.73,-3.92s7.75,1.2 10.06,-1.49c1.59,-1.86 1.5,-4.56 1.71,-7C320.03,207.04 332.59,205.96 332.65,204.57Z"
+      android:fillColor="@color/drawable_darker"/>
 </vector>
diff --git a/app/src/main/res/drawable/empty_state_favourite_coins.xml b/app/src/main/res/drawable/empty_state_favourite_coins.xml
deleted file mode 100644
index 28958d32..00000000
--- a/app/src/main/res/drawable/empty_state_favourite_coins.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="485.83dp"
-    android:height="483.5dp"
-    android:viewportWidth="485.83"
-    android:viewportHeight="483.5">
-    <path
-        android:pathData="M320.46,128.1L240.72,128.1a11.48,11.48 0,0 1,-9.07 -4.39h0a11.62,11.62 0,0 1,-2.18 -9.97,201.63 201.63,0 0,0 -0,-93.65 11.62,11.62 0,0 1,2.18 -9.97,11.48 11.48,0 0,1 9.07,-4.39h79.74a11.62,11.62 0,0 1,11.44 9.76,337.96 337.96,0 0,1 0,102.86A11.62,11.62 0,0 1,320.46 128.1Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M240.72,11.73a5.51,5.51 0,0 0,-4.35 2.11,5.66 5.66,0 0,0 -1.05,4.85 207.66,207.66 0,0 1,0 96.45,5.66 5.66,0 0,0 1.05,4.85l0,0a5.51,5.51 0,0 0,4.35 2.11h79.74a5.58,5.58 0,0 0,5.51 -4.67,331.99 331.99,0 0,0 0,-101.04 5.58,5.58 0,0 0,-5.51 -4.67Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M470.46,204.1L390.72,204.1a11.48,11.48 0,0 1,-9.07 -4.39h0a11.62,11.62 0,0 1,-2.18 -9.97,201.63 201.63,0 0,0 -0,-93.65 11.62,11.62 0,0 1,2.18 -9.97,11.48 11.48,0 0,1 9.07,-4.39h79.74a11.62,11.62 0,0 1,11.44 9.76,337.96 337.96,0 0,1 0,102.86A11.62,11.62 0,0 1,470.46 204.1Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M390.72,87.73a5.51,5.51 0,0 0,-4.35 2.11,5.66 5.66,0 0,0 -1.05,4.85 207.66,207.66 0,0 1,0 96.45,5.66 5.66,0 0,0 1.05,4.85l0,0a5.51,5.51 0,0 0,4.35 2.11h79.74a5.58,5.58 0,0 0,5.51 -4.67,331.99 331.99,0 0,0 0,-101.04 5.58,5.58 0,0 0,-5.51 -4.67Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M311.46,290.6L231.72,290.6a11.98,11.98 0,0 1,-9.46 -4.58,12.12 12.12,0 0,1 -2.27,-10.39 201.13,201.13 0,0 0,-0 -93.41,12.12 12.12,0 0,1 2.27,-10.39 11.98,11.98 0,0 1,9.46 -4.58h79.74a12.13,12.13 0,0 1,11.93 10.18,338.46 338.46,0 0,1 0,103.01A12.13,12.13 0,0 1,311.46 290.6Z"
-        android:fillColor="@color/grey" />
-    <path
-        android:pathData="M271.81,228.5m-23,0a23,23 0,1 1,46 0a23,23 0,1 1,-46 0"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M282.81,225.5h-8v-8a3,3 0,0 0,-6 0v8h-8a3,3 0,0 0,0 6h8v8a3,3 0,0 0,6 0v-8h8a3,3 0,0 0,0 -6Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M88.6,471.06l12.26,0l3.83,-47.29l-16.1,0l0,47.29z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M85.47,467.06l24.14,-0h0a15.39,15.39 0,0 1,15.39 15.39v0.5l-39.53,0Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M22.6,471.06l12.26,0l5.83,-47.29l-18.09,0l0,47.29z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M19.47,467.06l24.14,-0h0a15.39,15.39 0,0 1,15.39 15.39v0.5l-39.53,0Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M24.77,456.12a4.98,4.98 0,0 1,-3.38 -1.32h0a4.96,4.96 0,0 1,-1.62 -3.54L14.86,275.05l69.81,17.45 21.54,64.62a70.46,70.46 0,0 1,3.55 25.82l-2.67,62.64a5,5 0,0 1,-4.99 4.76h-11.71a5.02,5.02 0,0 1,-4.95 -4.33l-8.37,-69.14a37.82,37.82 0,0 0,-5.53 -15.16l-16.47,-26.08a1,1 0,0 0,-1.84 0.41L40.29,451.13a4.99,4.99 0,0 1,-4.69 4.4l-10.55,0.59C24.96,456.12 24.87,456.12 24.77,456.12Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M73.06,136.41m-24.56,0a24.56,24.56 0,1 1,49.12 0a24.56,24.56 0,1 1,-49.12 0"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M84.34,299.67a5.08,5.08 0,0 1,-1.25 -0.16L83.09,299.51l-69.26,-17.76a5,5 0,0 1,-3.66 -5.82L26.07,190.25a31.21,31.21 0,0 1,18.25 -22.54,30.11 30.11,0 0,1 28.27,2.08c0.97,0.61 1.95,1.26 2.9,1.96a30.96,30.96 0,0 1,12.58 24.53l1.26,98.33a5.01,5.01 0,0 1,-4.99 5.07Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M20.95,300.68a10.06,10.06 0,0 1,4.21 -14.83l-3.08,-35.6 16.33,8.85 0.42,32.45a10.11,10.11 0,0 1,-17.88 9.13Z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M26.78,281.14a5.53,5.53 0,0 1,-1.37 -0.17,5.5 5.5,0 0,1 -3.97,-3.99l-8.02,-31.88a47.37,47.37 0,0 1,3.76 -33.13l16.81,-32.88a15.54,15.54 0,0 1,18.81 -11.02,15.36 15.36,0 0,1 9.47,7.1 15.57,15.57 0,0 1,1.65 11.91l-23.93,53.51 0.28,32.04a5.52,5.52 0,0 1,-3.58 5.2l-8.01,2.97A5.48,5.48 0,0 1,26.78 281.14Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M141.32,287.58a10.06,10.06 0,0 1,-8.49 -12.87l-28.99,-20.89 17.36,-6.6 24.87,20.85a10.11,10.11 0,0 1,-4.74 19.51Z"
-        android:fillColor="@color/tone_two" />
-    <path
-        android:pathData="M126.14,272.33a5.52,5.52 0,0 1,-2.46 -0.58L94.28,257.03a47.38,47.38 0,0 1,-22.66 -24.47L57.66,198.38a15.54,15.54 0,0 1,3.92 -21.44,15.35 15.35,0 0,1 11.59,-2.54 15.57,15.57 0,0 1,10.08 6.51l24.95,53.04L132.66,254.62a5.52,5.52 0,0 1,1.61 6.11l-2.97,8.01a5.47,5.47 0,0 1,-2.01 2.6,5.5 5.5,0 0,1 -3.15,0.99Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M67.9,161.34c1.3,0.57 3.98,-9.83 2.78,-11.91 -1.78,-3.09 -1.67,-3.07 -2.86,-5.12s-1.45,-4.85 0.08,-6.65 5.07,-1.56 5.77,0.7c-0.45,-4.29 3.79,-7.73 7.99,-8.7s8.63,-0.37 12.86,-1.23c4.9,-1 10,-5.11 8.05,-10.5a7.59,7.59 0,0 0,-1.48 -2.43c-2.26,-2.54 -5.42,-3.63 -8.51,-4.68 -6.43,-2.18 -13.04,-4.39 -19.82,-4.15A28.8,28.8 0,0 0,47.31 125.28a26.16,26.16 0,0 0,-1.08 4.03c-2.33,12.52 4.94,24.88 16.76,29.65Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M197.08,355.98 L123.44,325.39a11.48,11.48 0,0 1,-6.69 -7.54h0a11.62,11.62 0,0 1,1.81 -10.04,201.63 201.63,0 0,0 35.93,-86.48 11.62,11.62 0,0 1,5.83 -8.37,11.48 11.48,0 0,1 10.06,-0.58l73.64,30.6a11.62,11.62 0,0 1,6.82 13.4,337.96 337.96,0 0,1 -39.47,94.99A11.62,11.62 0,0 1,197.08 355.98Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M168.09,217.92a5.51,5.51 0,0 0,-4.83 0.28,5.66 5.66,0 0,0 -2.84,4.08 207.66,207.66 0,0 1,-37 89.06,5.66 5.66,0 0,0 -0.89,4.89l0,0a5.51,5.51 0,0 0,3.21 3.62l73.64,30.6a5.58,5.58 0,0 0,6.88 -2.2,331.99 331.99,0 0,0 38.77,-93.3 5.58,5.58 0,0 0,-3.3 -6.42Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M141,483.5h-140a1,1 0,1 1,0 -2h140a1,1 0,0 1,0 2Z"
-        android:fillColor="@color/white" />
-</vector>
diff --git a/app/src/main/res/drawable/empty_state_favourites.xml b/app/src/main/res/drawable/empty_state_favourites.xml
new file mode 100644
index 00000000..8e9a863e
--- /dev/null
+++ b/app/src/main/res/drawable/empty_state_favourites.xml
@@ -0,0 +1,117 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="974.76dp"
+    android:height="674.09dp"
+    android:viewportWidth="974.76"
+    android:viewportHeight="674.09">
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M88.1,294.41c-18.05,14.76 11.48,144.37 11.48,144.37s6.56,197.69 20.51,206.71 45.12,-0.82 57.42,-2.46 1.64,-123.86 -16.41,-168.98S157,363.31 157,363.31l97.61,18.87s-59.06,50.04 -56.6,60.7 65.62,46.76 77.11,48.4 33.63,-65.62 53.32,-111.56 -134.52,-75.47 -134.52,-75.47l-21.33,-40.19S106.14,279.64 88.1,294.41Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M137.09,648.89s-5.95,20.83 0,20.83 16.86,5.95 33.73,3.97 11.9,-22.82 0,-25.79 -8.93,-26.79 -8.93,-26.79c-3.97,-7.94 -22.82,1.98 -22.82,1.98Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M221.59,483.22s-10.21,19.11 -4.39,20.36 15.23,9.38 32.13,10.99 16.45,-19.79 5.44,-25.21 -3.08,-28.07 -3.08,-28.07c-2.21,-8.59 -22.72,-2.87 -22.72,-2.87Z" />
+    <path
+        android:fillColor="@color/tone_one"
+        android:pathData="M99.17,116.82c1.64,3.28 -5.74,44.29 -5.74,44.29l6.56,11.48s37.73,-14.76 31.99,-17.23 -4.92,-32.81 -4.92,-32.81S97.53,113.54 99.17,116.82Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M113.37,79.17m-50.29,0a50.29,50.29 0,1 1,100.59 0a50.29,50.29 0,1 1,-100.59 0" />
+    <path
+        android:fillColor="@color/tone_one"
+        android:pathData="M114.76,103.69m-34.45,0a34.45,34.45 0,1 1,68.9 0a34.45,34.45 0,1 1,-68.9 0" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M65.13,156.6c-10.66,2.46 -28.71,28.71 -28.71,28.71L65.13,214.02s20.51,77.11 22.97,80.39c16.12,21.5 88.59,-26.25 88.59,-26.25s-2.87,-23.38 -1.23,-34.86c1.58,-11.04 -6.15,-33.22 -6.15,-33.22s27.07,-11.48 21.33,-22.97 -41.01,-37.73 -55.78,-28.71 -44.29,0 -44.29,0S75.79,154.14 65.13,156.6Z" />
+    <path
+        android:fillColor="@color/tone_one"
+        android:pathData="M274.71,321.89s46.76,40.19 58.24,31.99 -44.29,-36.91 -44.29,-36.91Z" />
+    <path
+        android:fillColor="@color/tone_one"
+        android:pathData="M64.72,307.94c6.56,7.38 37.73,-11.48 33.74,-19.86s-28.81,8.38 -28.81,8.38S58.16,300.56 64.72,307.94Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M65.13,196.8l-34.45,63.98s39.37,32.81 44.29,33.63 -9.84,22.15 -9.84,22.15 -44.29,-31.17 -61.52,-46.76 32.81,-84.49 32.81,-84.49l14.76,-9.02Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M165.2,194.33 L205.4,256.68s61.52,68.9 69.72,72.18 18.05,-12.3 18.05,-12.3l-73.82,-89.41 -27.89,-50.04 -10.66,-4.1Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M78.69,62.76a34.69,20.81 0,1 0,69.37 0a34.69,20.81 0,1 0,-69.37 0z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M210.68,511.79a4.29,4.29 0,0 0,-4.29 4.29L206.39,662.32a4.29,4.29 0,0 0,4.29 4.29h498.67a4.29,4.29 0,0 0,4.29 -4.29L713.63,516.08a4.29,4.29 0,0 0,-4.29 -4.29Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M217.13,655.86L702.89,655.86L702.89,522.53L217.13,522.53Z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M641.57,628.2a7.1,7.1 0,1 0,0 14.21L669.98,642.41a7.1,7.1 0,1 0,0 -14.21L641.57,628.2Z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M349.12,614.43h327.97v1.87h-327.97z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M280.57,589.2m-41.37,0a41.37,41.37 0,1 1,82.74 0a41.37,41.37 0,1 1,-82.74 0" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M349.64,603.99l-1.04,-1.55l34.08,-22.72l23.37,11.22l33.62,-21.48l66.87,28.52l53.25,-26.16l51.71,20.96l64.97,-57.55l1.24,1.4l-65.84,58.32l-52.01,-21.09l-53.27,26.17l-66.75,-28.47l-33.66,21.51l-23.35,-11.21l-33.19,22.13z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M355.2,629.18a6.07,6.07 0,1 0,0 12.15h63.54a6.07,6.07 0,0 0,0 -12.15Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M296.37,570.69h6.46l-13.45,13.31a12.56,12.56 0,0 1,-17.63 0l-13.45,-13.31h6.46l10.22,10.11a7.95,7.95 0,0 0,11.17 0ZM264.68,607.71h-6.46l13.53,-13.39a12.56,12.56 0,0 1,17.63 0l13.53,13.39h-6.46l-10.3,-10.19a7.95,7.95 0,0 0,-11.17 0Z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M275.61,43.35a4.29,4.29 0,0 0,-4.29 4.29L271.32,193.89a4.29,4.29 0,0 0,4.29 4.29L774.28,198.17a4.29,4.29 0,0 0,4.29 -4.29L778.57,47.64a4.29,4.29 0,0 0,-4.29 -4.29Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M282.07,187.43L767.82,187.43L767.82,54.1L282.07,54.1Z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M706.51,159.77a7.1,7.1 0,1 0,0 14.21h28.41a7.1,7.1 0,0 0,0 -14.21L706.51,159.77Z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M414.06,145.99h327.97v1.87h-327.97z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M345.5,120.76m-41.37,0a41.37,41.37 0,1 1,82.74 0a41.37,41.37 0,1 1,-82.74 0" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M414.58,135.56l-1.04,-1.56l34.08,-22.72l23.37,11.22l33.61,-21.48l0.45,0.19l66.41,28.33l53.25,-26.16l51.71,20.96l64.97,-57.55l1.24,1.4l-65.84,58.32l-52.01,-21.08l-53.27,26.17l-66.75,-28.47l-33.66,21.51l-23.35,-11.21l-33.19,22.13z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M420.13,160.75a6.07,6.07 0,0 0,0 12.15h63.54a6.07,6.07 0,1 0,0 -12.15Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M362.15,115.94c0.77,-5.18 -3.17,-7.96 -8.56,-9.82l1.75,-7.01 -4.27,-1.06 -1.7,6.83c-1.12,-0.28 -2.27,-0.54 -3.42,-0.8l1.71,-6.87 -4.27,-1.06 -1.75,7.01c-0.93,-0.21 -1.84,-0.42 -2.73,-0.64l0,-0.02 -5.89,-1.47 -1.14,4.56s3.17,0.73 3.1,0.77a2.27,2.27 0,0 1,1.99 2.48l-1.99,7.99a3.54,3.54 0,0 1,0.44 0.14l-0.45,-0.11 -2.79,11.19a1.55,1.55 0,0 1,-1.96 1.01c0.04,0.06 -3.1,-0.77 -3.1,-0.77l-2.12,4.89 5.56,1.38c1.03,0.26 2.05,0.53 3.04,0.79l-1.77,7.09 4.26,1.06 1.75,-7.02c1.16,0.32 2.29,0.61 3.4,0.88l-1.74,6.98 4.27,1.06 1.77,-7.08c7.28,1.38 12.75,0.82 15.06,-5.76 1.86,-5.3 -0.09,-8.36 -3.92,-10.35 2.79,-0.65 4.89,-2.48 5.45,-6.27ZM352.39,129.61c-1.32,5.3 -10.24,2.44 -13.14,1.72l2.34,-9.4c2.89,0.72 12.17,2.15 10.8,7.68ZM353.71,115.86c-1.2,4.82 -8.63,2.37 -11.04,1.77l2.13,-8.52C347.2,109.71 354.97,110.83 353.71,115.86Z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M471.8,277.57a4.29,4.29 0,0 0,-4.29 4.29L467.51,428.1a4.29,4.29 0,0 0,4.29 4.29h498.67a4.29,4.29 0,0 0,4.29 -4.29L974.76,281.86a4.29,4.29 0,0 0,-4.29 -4.29Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M478.26,421.65h485.75L964.01,288.32L478.26,288.32Z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M902.7,393.99a7.1,7.1 0,1 0,0 14.21h28.41a7.1,7.1 0,1 0,0 -14.21h-28.41Z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M610.24,380.21h327.97v1.87h-327.97z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M541.69,354.98m-41.37,0a41.37,41.37 0,1 1,82.74 0a41.37,41.37 0,1 1,-82.74 0" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M610.76,369.77l-1.04,-1.55l34.08,-22.72l23.37,11.22l33.61,-21.48l0.46,0.19l66.41,28.33l53.25,-26.16l51.71,20.96l64.97,-57.55l1.24,1.4l-65.84,58.32l-52.01,-21.08l-53.27,26.17l-66.75,-28.47l-33.66,21.51l-23.35,-11.21l-33.19,22.13z" />
+    <path
+        android:fillColor="@color/background"
+        android:pathData="M616.32,394.96a6.07,6.07 0,0 0,0 12.15h63.54a6.07,6.07 0,1 0,0 -12.15Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M541.68,382.25l16.75,-23.59l-16.75,9.89l0,0l-16.74,-9.89l16.74,23.59l0,0l0,0l0,0l0,0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M541.68,365.38l0,0l0,0l0,0l16.74,-9.89l-16.74,-27.77l0,0l0,0l-0,0l0,0l-16.74,27.77l16.74,9.89z" />
+</vector>
diff --git a/app/src/main/res/drawable/empty_state_search.xml b/app/src/main/res/drawable/empty_state_search.xml
deleted file mode 100644
index 9844c3c1..00000000
--- a/app/src/main/res/drawable/empty_state_search.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="552.81dp"
-    android:height="515.46dp"
-    android:viewportWidth="552.81"
-    android:viewportHeight="515.46">
-    <path
-        android:pathData="M195.7,207.11c-9.39,0 -17.02,7.64 -17.02,17.02v26.64c0,9.39 7.64,17.02 17.02,17.02h26.64c9.39,0 17.02,-7.64 17.02,-17.02v-26.64c0,-9.39 -7.64,-17.02 -17.02,-17.02h-26.64Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M213.37,67.11c-11.83,0 -21.45,9.62 -21.45,21.45v33.57c0,11.83 9.62,21.45 21.45,21.45h33.57c11.83,0 21.45,-9.62 21.45,-21.45v-33.57c0,-11.83 -9.62,-21.45 -21.45,-21.45h-33.57Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M323.89,160.92c-11.83,0 -21.45,9.62 -21.45,21.45v33.57c0,11.83 9.62,21.45 21.45,21.45h33.57c11.83,0 21.45,-9.62 21.45,-21.45v-33.57c0,-11.83 -9.62,-21.45 -21.45,-21.45h-33.57Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M275.84,498.81l-6.82,-0.06l-3.02,-26.92l10.07,0.08l-0.23,26.89z"
-        android:fillColor="@color/tone_one" />
-    <path
-        android:pathData="M254,509.65c-0.01,1.68 1.34,3.06 3.02,3.08l13.56,0.11 2.37,-4.81 0.87,4.84 5.12,0.05 -1.29,-17.25 -1.78,-0.12 -7.26,-0.5 -2.34,-0.16 -0.04,4.88 -10.89,7.39c-0.83,0.56 -1.33,1.5 -1.34,2.5Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M310.54,498.81l-6.82,-0.06l-3.02,-26.92l10.07,0.08l-0.23,26.89z"
-        android:fillColor="@color/tone_one" />
-    <path
-        android:pathData="M288.7,509.65c-0.01,1.68 1.34,3.06 3.02,3.08l13.56,0.11 2.37,-4.81 0.87,4.84 5.12,0.05 -1.29,-17.25 -1.78,-0.12 -7.26,-0.5 -2.34,-0.16 -0.04,4.88 -10.89,7.39c-0.83,0.56 -1.33,1.5 -1.34,2.5Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M249.08,281.18l27.64,0.87 26.19,5.82s-2.62,3.2 6.11,11.93c0,0 11.64,20.37 3.49,40.16l-3.49,79.15s10.18,55.79 2.4,73.55l-10.28,0.64 -17.4,-73.55 -8.48,-79.21 -4.07,77.98s15.58,53.53 5.74,74.78l-11.13,-0.64 -19.05,-74.13s-8.15,-85.55 -6.98,-101.84c1.16,-16.3 9.31,-35.5 9.31,-35.5Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M341.91,156.11c-3.78,0.98 -6.05,4.84 -5.07,8.61 0.45,1.73 1.5,3.14 2.88,4.07l-0,0.01 -0.54,12.98 9.94,4.6 0.79,-19.98 -0.07,0c0.86,-1.53 1.16,-3.39 0.68,-5.23 -0.98,-3.78 -4.84,-6.05 -8.61,-5.07Z"
-        android:fillColor="@color/tone_one" />
-    <path
-        android:pathData="M286.38,202.45c-2.09,-2.07 -3.3,-4.87 -3.34,-7.92 -0.06,-4.09 1.99,-7.81 5.49,-9.94 4.03,-2.45 9.06,-2.2 12.82,0.63l31.2,23.49 5.56,-33.84 11.94,3.84 -2.85,44.07c-0.2,3.08 -1.94,5.8 -4.66,7.26 -2.72,1.47 -5.95,1.43 -8.63,-0.1l-45.09,-25.66c-0.91,-0.52 -1.72,-1.14 -2.43,-1.84Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M238.8,137.18c1.99,3.36 0.89,7.69 -2.46,9.69 -1.54,0.91 -3.28,1.17 -4.91,0.87l-0.01,0.01 -8.76,9.6 -10.29,-3.73 13.5,-14.75 0.05,0.05c0.47,-1.7 1.56,-3.22 3.2,-4.19 3.36,-1.99 7.69,-0.89 9.69,2.46Z"
-        android:fillColor="@color/tone_one" />
-    <path
-        android:pathData="M242.58,208.79l-50.09,-13.53c-2.98,-0.81 -5.3,-3.05 -6.2,-6.01 -0.9,-2.96 -0.22,-6.11 1.8,-8.44l29.01,-33.3 11.18,5.68 -19.88,27.95 38.7,5.28c4.67,0.64 8.42,4.01 9.55,8.58 0.98,3.97 -0.18,8.05 -3.1,10.92 -2.18,2.13 -5.01,3.27 -7.95,3.27 -1,0 -2.02,-0.13 -3.03,-0.4Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M313.99,292.82l-70.04,3.21c-1.92,-2.92 -1.4,-7.31 1.29,-12.81 10.17,-20.77 2.45,-60.05 -2.75,-80.51 -1.46,-5.74 2.46,-11.45 8.35,-12.04l6.6,-0.66 6.1,-18.63h21.38l8.87,10.13 15.05,9.14c-2.74,28.22 -14.41,68.07 2.22,88.06 3.64,4.37 4.67,9.1 2.92,14.11Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M271.52,150.99m-20.82,0a20.82,20.82 0,1 1,41.65 0a20.82,20.82 0,1 1,-41.65 0"
-        android:fillColor="@color/tone_one" />
-    <path
-        android:pathData="M295.08,137.66c2.9,-10.56 -28.68,-19.62 -34.82,-11.11 -0.85,-1.21 -4.01,-1.94 -5.45,-1.57 -1.45,0.37 -2.66,1.3 -3.85,2.2 -1.63,1.25 -3.32,2.55 -4.33,4.36 -1.01,1.8 -1.16,4.24 0.19,5.8 1.08,1.24 2.97,7.82 4.58,8.15 1.13,0.23 2.08,0.42 2.89,0.55 0.73,-1.06 2.58,-2.39 2.45,-3.68 1.1,0.73 0.7,2.01 0.48,3.31 -0.74,4.35 -17.35,38.06 -7.83,28.12 0.94,0.56 2.11,1.08 3.45,1.55 2.28,-3.44 4.15,-7.49 5.38,-11.72l0.01,0.08c0.42,3.68 3.11,6.7 6.67,7.73 14.28,4.14 25.83,-1.93 29.8,-12.88 -1.45,-2.95 -2.09,-2.63 -1.96,-2.72 1.82,-1.22 4.31,-0.42 5.09,1.62 0.23,0.6 0.44,1.12 0.62,1.51 2.07,-7.4 4.53,-6.34 -3.38,-21.29Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M285.23,129.99l-1.46,-7.46c-0.12,-0.63 -0.24,-1.31 0.04,-1.88 0.36,-0.74 1.3,-1.04 2.11,-0.92 0.81,0.12 1.42,0.86 2.23,1 2.81,0.5 6.52,-2.28 7.53,4.74 0.42,2.93 5.09,3.24 6.65,5.75 1.56,2.51 1.75,6.14 -0.38,8.19 -1.7,1.64 -4.43,1.83 -6.64,0.99 -2.21,-0.84 -3.98,-2.53 -5.53,-4.31s-2.95,-3.71 -4.74,-5.26"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M322.93,60.76c-16.75,0 -30.38,-13.63 -30.38,-30.38S306.18,0 322.93,0s30.38,13.63 30.38,30.38 -13.63,30.38 -30.38,30.38ZM322.93,12.15c-10.05,0 -18.23,8.18 -18.23,18.23s8.18,18.23 18.23,18.23 18.23,-8.18 18.23,-18.23 -8.18,-18.23 -18.23,-18.23Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M369.68,81.41c-1.49,0 -2.98,-0.54 -4.15,-1.64l-28.51,-26.72c-2.45,-2.29 -2.58,-6.14 -0.28,-8.59 2.29,-2.46 6.14,-2.58 8.59,-0.28l28.51,26.72c2.45,2.29 2.58,6.14 0.28,8.59 -1.2,1.28 -2.81,1.92 -4.43,1.92Z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M512.11,658h-381a1,1 0,1 1,0 -2h381a1,1 0,1 1,0 2Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M0,514.27c0,0.66 0.53,1.19 1.19,1.19H551.48c0.66,0 1.19,-0.53 1.19,-1.19 0,-0.66 -0.53,-1.19 -1.19,-1.19H1.19c-0.66,0 -1.19,0.53 -1.19,1.19Z"
-        android:fillColor="@color/white"/>
-</vector>
diff --git a/app/src/main/res/drawable/empty_state_search_query.xml b/app/src/main/res/drawable/empty_state_search_query.xml
new file mode 100644
index 00000000..effd9891
--- /dev/null
+++ b/app/src/main/res/drawable/empty_state_search_query.xml
@@ -0,0 +1,123 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="982.49dp"
+    android:height="763.01dp"
+    android:viewportWidth="982.49"
+    android:viewportHeight="763.01">
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M559.43,333.06m-40.03,0a40.03,40.03 0,1 1,80.06 0a40.03,40.03 0,1 1,-80.06 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M657.54,384.5l-41.83,-41.83a44.31,44.31 0,0 0,-14.43 -61.93,44.46 44.46,0 0,0 -58.91,12.24 44.31,44.31 0,0 0,60.03 63l41.83,41.83A9.41,9.41 0,0 0,657.54 384.5ZM600.84,341.11a31.68,31.68 0,1 1,9.28 -22.4A31.59,31.59 0,0 1,600.84 341.11Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M960.77,446.21C1067.75,564.51 757.64,735.01 507.05,735.01S83.11,602.91 53.33,446.21C-18.86,66.26 668.41,-175.23 507.05,157.4 271.86,642.25 876.52,353.04 960.77,446.21Z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M912.77,474.21C1019.75,592.51 709.64,763.01 459.05,763.01S35.11,630.91 5.33,474.21C-66.86,94.26 620.41,-147.23 459.05,185.4 223.86,670.25 828.52,381.04 912.77,474.21Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M168.83,123.6m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M122.51,152.59m-15,0a15,15 0,1 1,30 0a15,15 0,1 1,-30 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M348.9,142.9m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M122.9,452.9m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M542.9,658.9m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M151.9,339.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M399.9,563.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M850.9,534.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M709.9,623.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M562.9,515.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M372.9,219.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M396.9,71.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M382.9,694.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M234.9,631.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M703.9,523.9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M148.37,224.8m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M351.9,362.9c0,26.88 -41.56,89.52 -53.7,107.25a3.99,3.99 0,0 1,-6.59 0c-12.15,-17.73 -53.7,-80.37 -53.7,-107.25a57,57 0,1 1,114 0Z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M294.9,358.9m-29,0a29,29 0,1 1,58 0a29,29 0,1 1,-58 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M260.9,496.4a33.5,6.5 0,1 0,67 0a33.5,6.5 0,1 0,-67 0z" />
+    <path
+        android:fillColor="@color/tone_two"
+        android:pathData="M816.85,317.92a10.53,10.53 0,0 0,-0.64 1.53l-47.78,13.28 -8.61,-8.43L745.4,335.63 759.2,352.03a8,8 0,0 0,9.35 2.17l51.62,-22.78a10.5,10.5 0,1 0,-3.31 -13.5Z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M766.75,333.5l-17.94,13.96a4.5,4.5 0,0 1,-6.68 -1.34L730.98,326.4a12.5,12.5 0,0 1,19.77 -15.29l16.34,15.59a4.5,4.5 0,0 1,-0.34 6.81Z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M821.44,311.32l18.19,8.18a3.15,3.15 0,0 1,1.58 4.16l-2.15,4.79a1.05,1.05 0,0 1,0.53 1.39l-0.86,1.91a1.05,1.05 0,0 1,-1.39 0.53l-0.86,1.91a1.05,1.05 0,0 1,0.53 1.39l-0.86,1.91a1.05,1.05 0,0 1,-1.39 0.53L823.11,363.87a3.15,3.15 0,0 1,-4.16 1.58l-18.19,-8.18a3.15,3.15 0,0 1,-1.58 -4.16l18.09,-40.21A3.15,3.15 0,0 1,821.44 311.32Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M804.07,354.72l14.59,6.57a3.03,3.03 0,0 0,4 -1.51l6.74,-14.99 2.34,-5.2 6.1,-13.56a3.03,3.03 0,0 0,-1.51 -3.99l-4.59,-2.07L821.72,315.47a3.02,3.02 0,0 0,-3.99 1.52L811.83,330.1l-6.72,14.93 -2.56,5.7A3.02,3.02 0,0 0,804.07 354.72Z" />
+    <path
+        android:fillColor="@color/tone_two"
+        android:pathData="M773.58,540.44l12.26,-0l5.83,-47.29l-18.09,0l0,47.29z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M770.45,536.44l24.14,-0h0a15.39,15.39 0,0 1,15.39 15.39v0.5l-39.53,0Z" />
+    <path
+        android:fillColor="@color/tone_two"
+        android:pathData="M805.58,537.44l12.26,-0l5.83,-47.29l-18.09,0l0,47.29z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M802.45,533.44l24.14,-0h0a15.39,15.39 0,0 1,15.39 15.39v0.5l-39.53,0Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M718.59,429.48a39.41,39.41 0,0 0,36.9 26.81l0.62,0.01c6.33,0.18 13.76,-1.86 21.05,-4.79 14.4,-5.79 28.23,-15.06 31.9,-17.61l-6.22,59.79 -2.52,24.24a4.51,4.51 0,0 0,4.48 4.97h15.53a4.51,4.51 0,0 0,4.36 -3.36l25.64,-97.65a19.03,19.03 0,0 0,-19.71 -23.83l-53.26,3.65 3.72,-14.88 -47.54,-3.16 -0.14,0.1c-1.14,0.83 -2.25,1.7 -3.31,2.61a40.27,40.27 0,0 0,-6.99 7.66A38.49,38.49 0,0 0,718.59 429.48Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M718.59,429.48a39.41,39.41 0,0 0,36.9 26.81,196.15 196.15,0 0,0 22.57,-13.39l-0.9,8.61 -7.84,75.42a4.51,4.51 0,0 0,4.48 4.97h15.53a4.51,4.51 0,0 0,4.36 -3.36l9.15,-34.85 16.49,-62.8a19.03,19.03 0,0 0,-19.71 -23.83l-53.26,3.65 3.72,-14.88 -26.98,-1.79A38.49,38.49 0,0 0,718.59 429.48Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M730.02,389.83l-0.36,-0.04 -8.3,-40.79c-0.07,-0.35 -6.85,-35.53 13.94,-53.92l0.36,-2.52a4.5,4.5 0,0 1,5.79 -3.66l19.58,6.07a4.49,4.49 0,0 1,3.02 5.44l-1.9,7.24c2.64,3.1 33.71,40.51 22.89,69.34L780.19,395.95Z" />
+    <path
+        android:fillColor="@color/tone_two"
+        android:pathData="M811.34,358a10.53,10.53 0,0 0,-1.33 0.99l-47.9,-12.86 -3.13,-11.63 -18.18,2.43 3.54,21.13a8,8 0,0 0,6.95 6.62l56.03,6.62a10.5,10.5 0,1 0,4.01 -13.31Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M760.27,345.94 L737.72,348.85a4.5,4.5 0,0 1,-5.07 -4.55l0.43,-22.65a12.5,12.5 0,0 1,24.8 -3.12l6.14,21.73a4.5,4.5 0,0 1,-3.76 5.69Z" />
+    <path
+        android:fillColor="@color/tone_two"
+        android:pathData="M753.92,258.8m-24.56,0a24.56,24.56 0,1 1,49.12 0a24.56,24.56 0,1 1,-49.12 0" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M752.63,260.85l-3.08,-5.6c-5.82,23.73 4.46,43.37 4.46,43.37l-39.93,-18.6 0.38,-6.6 -3.95,4.48 -5.68,-3.13 -0.75,-4.28 -4.29,1.06 15.64,-28.39c15.18,-27.01 37.26,-16.7 37.26,-16.7 35.12,-1.67 30.83,32.98 30.83,32.98Z" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M437.15,410.47a47.5,12.18 57.34,1 0,20.51 -13.15a47.5,12.18 57.34,1 0,-20.51 13.15z" />
+</vector>
diff --git a/app/src/main/res/drawable/empty_state_search_results.xml b/app/src/main/res/drawable/empty_state_search_results.xml
new file mode 100644
index 00000000..5443fc00
--- /dev/null
+++ b/app/src/main/res/drawable/empty_state_search_results.xml
@@ -0,0 +1,114 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="861.34dp"
+    android:height="648.68dp"
+    android:viewportWidth="861.34"
+    android:viewportHeight="648.68">
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M318.64,172.65c37.1,-23.94 88.2,-14.64 124.35,10.73a196.93,196.93 0,0 1,32.31 28.83c5.64,6.19 10.99,12.69 16.11,19.41 1.26,1.65 2.52,3.31 3.75,5q1.26,1.71 2.5,3.44c10.38,14.42 19.89,29.6 29.21,44.64 23.25,37.54 47.11,76.19 82.53,102.55 7.3,5.43 17.48,10.32 24.96,5.13 6.49,-4.5 6.77,-13.97 5.29,-21.72 -5.49,-28.74 -25.3,-52.56 -46.34,-72.89 -21.04,-20.33 -44.33,-38.97 -60.23,-63.54 -15.9,-24.57 -23.16,-57.36 -9.24,-83.09 12,-22.17 37.82,-34.61 63.02,-35.19 25.2,-0.57 49.69,9.22 71.01,22.67 21.32,13.46 40.07,30.53 59.63,46.43 11.79,9.59 28.26,19.11 41.11,10.99 10.86,-6.86 11.7,-23.34 5.23,-34.43s-18.02,-18.06 -29.09,-24.57q-51.56,-30.29 -103.12,-60.57c-10.55,-6.19 -21.32,-12.57 -29.11,-22.01 -7.79,-9.43 -12.11,-22.69 -7.82,-34.14 4.23,-11.29 16.06,-18.45 28.02,-19.95 11.96,-1.49 24.01,1.82 35.2,6.31 41.91,16.83 140.6,126.95 166.9,145.78 16.9,12.09 34.66,27.4 36.37,48.11 2.13,25.78 -23.53,47.18 -49.28,49.68 -25.75,2.51 -50.7,-8.69 -73.71,-20.52s-46.49,-24.89 -72.31,-26.53c-25.82,-1.64 -54.8,12.16 -60.92,37.3 -5.32,21.87 8.21,44.45 25.84,58.44 13.8,10.96 29.99,18.26 45.63,26.46 4.34,2.27 8.64,4.62 12.83,7.13a180.25,180.25 0,0 1,29.93 22.5,183.68 183.68,0 0,1 25.77,29.64 179.18,179.18 0,0 1,15.62 27.17q1.01,2.18 1.95,4.41c0.6,1.43 1.18,2.87 1.73,4.33 7.18,18.91 9.98,40.11 0.8,57.76 -9.15,17.61 -28.97,28.03 -48.75,29.48a89.8,89.8 0,0 1,-33.79 -4.46,137.23 137.23,0 0,1 -23.13,-9.94C625.2,475.04 598.07,445.88 573.31,415.91c-24.76,-29.97 -48.08,-61.53 -77.48,-86.98 -29.4,-25.45 -66.24,-44.69 -105.12,-44.4 -38.88,0.29 -78.96,23.98 -90.01,61.26 -16.1,-27.74 -26.98,-59.35 -25.54,-91.39S291.7,190.04 318.64,172.65Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M469.49,272.02m-4.27,0a4.27,4.27 0,1 1,8.54 0a4.27,4.27 0,1 1,-8.54 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M308.5,275.79m-6.6,0a6.6,6.6 0,1 1,13.21 0a6.6,6.6 0,1 1,-13.21 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M785.87,221.52m-2.44,0a2.44,2.44 0,1 1,4.88 0a2.44,2.44 0,1 1,-4.88 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M736.49,90.36m-2.44,0a2.44,2.44 0,1 1,4.88 0a2.44,2.44 0,1 1,-4.88 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M673.7,331.08a26.08,26.08 0,0 1,2.78 -5.68c4.34,2.27 8.64,4.62 12.83,7.13a180.25,180.25 0,0 1,29.93 22.5,26.02 26.02,0 0,1 -45.55,-23.95Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M362.47,249.17m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M668.25,64.51m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M645.78,20.06m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M822.5,185.77m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M691.4,189.36m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M621.84,427.41m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M543.41,193.29m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M539.9,146.1m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M731.56,501.52m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M687.4,469.42m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M339.87,186.12c5.67,0.27 17.41,3.08 30.12,6.73 12.71,3.65 26.49,8.09 40.1,12.49q35.73,11.54 71.46,23.08 4.91,1.58 9.85,3.2c1.26,1.65 2.52,3.31 3.75,5 -2.89,-1.02 -5.8,-2.01 -8.7,-2.96 -12.38,-4.02 -23.12,-6.68 -35.13,-10.34 -18.49,-5.63 -37.99,-13.02 -56.91,-19.9C375.49,196.54 353.79,189.12 339.87,186.12Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M763.43,137.26l53.58,88.95 -50.56,-90.72a1.85,1.85 0,1 0,-3.02 1.77Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M737.3,397.27m-2.5,0a2.5,2.5 0,1 1,4.99 0a2.5,2.5 0,1 1,-4.99 0" />
+    <path
+        android:fillColor="@color/primary_container"
+        android:pathData="M299.54,375.53m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0" />
+    <path
+        android:fillColor="@color/tone_three"
+        android:pathData="M290.06,366.74a11.44,11.44 0,0 1,-7.31 -15.95L253.77,322.27l20.66,-4.41 24.34,27.76a11.5,11.5 0,0 1,-8.72 21.11Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M151.54,144.77l16.16,10.65 18.91,4.43s15,107.2 22.37,113.63 1.16,7.04 3.16,15.91 6.62,27.01 6.62,27.01c-44.9,27.83 -85.01,31.23 -119.23,4.57a8.05,8.05 0,0 1,3.77 -9.37c5.79,-3.59 -6.76,-17.67 -2.03,-20.5s-3.63,-23.91 -3.63,-23.91l1.46,-45.3 -4.07,-6.95 5.73,-44.6 14.77,-6.56 5.06,-14.99Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M158.54,148.53l26.64,8.87s29.47,-3.11 30.66,40.76 -4.3,67.41 -4.3,67.41S272.85,388.85 206.44,352.44L187.04,276.03l-20,-120Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M185.26,245.52l13.82,-1.91s1.33,20.83 7.94,23.99 4.38,3.68 5.16,7.02 -5.88,12.6 -0.64,14.91 51,60 51,60l27,-25c-1.86,-5.03 -10.79,-0.94 -11.35,-6.27 -0.7,-8.06 -14.84,-30.07 -17.85,-32.9s-1.82,-7.8 -3.38,-14.48 -0.48,-0.49 -3.07,-11.63 -37.81,-67.91 -39.03,-78.2 -15.56,-16.34 -15.56,-16.34l-11.14,2.6Z" />
+    <path
+        android:fillColor="@color/tone_three"
+        android:pathData="M68.58,616l16.26,4.27l24.21,-60.7l-24,-6.3l-16.47,62.73z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M63.55,632.81l50.01,13.13 0.17,-0.63a20.13,20.13 0,0 0,-14.35 -24.58l-0,-0 -7.32,-9.33 -18.87,2.46 -4.37,-1.15Z" />
+    <path
+        android:fillColor="@color/tone_three"
+        android:pathData="M151.96,628.16l16.81,-0l8,-64.86l-24.82,0l0,64.86z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M151.36,645.71l51.71,-0v-0.65a20.13,20.13 0,0 0,-20.13 -20.13h-0l-9.45,-7.17 -17.62,7.17 -4.51,0Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M109.9,317.78c-4.06,5.08 -2.03,22.34 -2.03,22.34s-7.11,55.85 -4.06,60.93 -2.03,9.14 -5.08,16.25 -6.09,24.37 -6.09,24.37c-17.26,14.22 -16.25,79.21 -16.25,79.21l-6.09,57.88c2.03,6.09 30.47,7.11 34.53,6.09S148.49,440.66 148.49,440.66s-2.03,138.11 -2.03,144.2 27.42,3.05 33.51,3.05S224.65,339.11 224.65,339.11v-14.22l-5.08,-7.11S113.96,312.71 109.9,317.78Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M119.54,151.53 L94.6,167.42 82.54,177.53l16,102s-24.31,92.72 14,87 36.16,-89.04 36.16,-89.04Z" />
+    <path
+        android:fillColor="@color/tone_three"
+        android:pathData="M152.91,296.42a11.44,11.44 0,0 1,-16.54 -5.83l-40.64,0.98 11.2,-17.91 36.88,1.81A11.5,11.5 0,0 1,152.91 296.42Z" />
+    <path
+        android:fillColor="@color/tone_three"
+        android:pathData="M132.63,105.61m-32.12,0a32.12,32.12 0,1 1,64.24 0a32.12,32.12 0,1 1,-64.24 0" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M96.2,84.51c3.61,-5.58 10.37,-9.3 16.94,-8.25a23.13,23.13 0,0 1,38.75 -13.49,7.19 7.19,0 0,1 7.03,-0.7 14.83,14.83 0,0 1,5.71 4.59,33.28 33.28,0 0,1 4.66,33.86c0.8,-2.91 -2.12,-5.66 -5.07,-6.31 -2.95,-0.65 -6.05,-0.04 -9.04,-0.46 -3.84,-0.55 -7.28,-2.77 -11.13,-3.27 -3.23,-0.42 -6.48,0.41 -9.63,1.24 -3.15,0.83 -6.39,1.68 -9.62,1.29 -3.23,-0.38 -7.4,11.87 -7.34,20.5 0.01,1.64 -0.33,3.74 -1.92,4.08 -1.97,0.43 -3.11,-2.29 -4.98,-3.03a3.47,3.47 0,0 0,-4.25 2.26,5.65 5.65,0 0,0 1.08,5.06 16.7,16.7 0,0 0,4.05 3.51l-0.77,0.64c-1.28,1.7 -3.95,1.77 -5.8,0.72a12.51,12.51 0,0 1,-4.16 -4.74c-3.42,-5.69 -6.43,-11.76 -7.63,-18.29S92.59,90.09 96.2,84.51Z" />
+    <path
+        android:fillColor="@color/drawable_lighter"
+        android:pathData="M107.54,180.53l-14.43,-12.37s-16.85,5.26 -19.71,16.31c-22.49,28.76 -34.6,62.35 -37.86,100.06 29.36,11.09 65.32,15.02 104,16l-8,-30 -55,-10Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M332.53,648.03L265.55,648.03A11.52,11.52 0,0 1,254.04 636.52L254.04,401.54a11.52,11.52 0,0 1,11.51 -11.51L332.53,390.03a11.52,11.52 0,0 1,11.51 11.51L344.04,636.52A11.52,11.52 0,0 1,332.53 648.03Z" />
+    <path
+        android:fillColor="@color/drawable_darker"
+        android:pathData="M316.71,396.03L282.36,396.03A4.33,4.33 0,0 1,278.04 391.7v-12.35a4.33,4.33 0,0 1,4.33 -4.33L316.71,375.03a4.33,4.33 0,0 1,4.33 4.33L321.04,391.7A4.33,4.33 0,0 1,316.71 396.03Z" />
+</vector>
diff --git a/app/src/main/res/drawable/error_state.xml b/app/src/main/res/drawable/error_state.xml
index c3e04db8..124a8ccb 100644
--- a/app/src/main/res/drawable/error_state.xml
+++ b/app/src/main/res/drawable/error_state.xml
@@ -1,57 +1,57 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="729dp"
-    android:height="658dp"
-    android:viewportWidth="729"
-    android:viewportHeight="658">
-    <path
-        android:pathData="M0,93h298v168h-298z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M320,246h-300v-170h300ZM22,244h296v-166h-296Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M409,17h298v168h-298z"
-        android:fillColor="@color/surface" />
-    <path
-        android:pathData="M729,170h-300v-170h300ZM431,168h296v-166h-296Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M512.11,658h-381a1,1 0,1 1,0 -2h381a1,1 0,1 1,0 2Z"
-        android:fillColor="@color/white" />
-    <path
-        android:pathData="M369.63,421.73A12.38,12.38 0,0 1,384.75 410.25l16.37,-23.07 16.45,6.53 -23.58,32.26a12.45,12.45 0,0 1,-24.36 -4.23Z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M387.59,401.89l29.11,-48.96L404.84,321.31l16.15,-43.07 0.6,0.26c0.39,0.17 9.57,4.26 10.93,18.93l18.56,58.34 -49.54,64.27Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M229.5,221.91a12.38,12.38 0,0 1,10.28 15.96l21.74,18.11 -7.78,15.89 -30.34,-26a12.45,12.45 0,0 1,6.1 -23.96Z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M247.89,241.35l46.56,32.81 32.45,-9.38 41.7,19.43 -0.3,0.57c-0.2,0.38 -4.99,9.21 -19.72,9.43l-59.6,14 -60.24,-54.36Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M333.09,640.3l-16.19,0l-7.7,-62.43l23.89,0l-0,62.43z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M300.57,635.67h35.99a0,0 0,0 1,0 0v19.66a0,0 0,0 1,0 0H285.69a0,0 0,0 1,0 0v-4.77A14.89,14.89 0,0 1,300.57 635.67Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M397.78,640.3l-16.19,0l-7.7,-62.43l23.89,0l-0,62.43z"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M365.27,635.67h35.99a0,0 0,0 1,0 0v19.66a0,0 0,0 1,0 0H350.38a0,0 0,0 1,0 0v-4.77A14.89,14.89 0,0 1,365.27 635.67Z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M403.54,412.41l-1.32,92.42l-1.32,121.47l-29.05,-2.64l-14.52,-167.68l-18.48,167.68l-29.99,0l-3.02,-169l10.56,-36.97l87.14,-5.28z"
-        android:fillColor="@color/drawable_darker" />
-    <path
-        android:pathData="M313.51,418.25l-4.43,-0.19L329.63,304.83l-8.42,-34.22a7.49,7.49 0,0 1,4.64 -8.8l15.14,-5.68 5.35,-14.71 42.21,4.55L389.6,257.47c4.57,1.47 42.24,14.01 39.64,28.3 -2.56,14.11 -17.71,58.49 -18.48,60.74l-2.65,63.65 -0.33,0.16c-0.39,0.2 -29.48,14.5 -61.09,14.5C335.56,424.82 324.11,423.04 313.51,418.25Z"
-        android:fillColor="@color/drawable_lighter" />
-    <path
-        android:pathData="M365.8,203.75m-14.58,26.66a30.39,30.39 73.66,1 1,29.15 -53.33a30.39,30.39 73.66,1 1,-29.15 53.33"
-        android:fillColor="@color/tone_three" />
-    <path
-        android:pathData="M390.42,233.17c-5.79,6.17 -16.55,2.86 -17.3,-5.57a10.18,10.18 0,0 1,0.01 -1.97c0.39,-3.73 2.55,-7.12 2.03,-11.06a5.8,5.8 0,0 0,-1.06 -2.72c-4.61,-6.18 -15.45,2.76 -19.8,-2.83 -2.67,-3.43 0.47,-8.83 -1.58,-12.67 -2.7,-5.06 -10.72,-2.56 -15.74,-5.34 -5.59,-3.08 -5.26,-11.66 -1.58,-16.88 4.49,-6.36 12.36,-9.76 20.13,-10.25s15.49,1.61 22.74,4.44c8.24,3.21 16.42,7.65 21.49,14.9 6.17,8.81 6.76,20.66 3.68,30.97C401.55,220.47 395.15,228.13 390.42,233.17Z"
-        android:fillColor="@color/drawable_darker" />
+    android:width="524.67dp"
+    android:height="418.27dp"
+    android:viewportWidth="524.67"
+    android:viewportHeight="418.27">
+  <path
+      android:pathData="M251.74,416.42l-159.46,0.06c-8.01,0 -15.19,-4.14 -19.19,-11.07 -2,-3.47 -3.01,-7.27 -3.01,-11.08 -0,-3.81 1,-7.61 3,-11.08l79.68,-145.05c4,-6.94 11.18,-11.08 19.19,-11.09s15.19,4.14 19.19,11.07l79.79,145.01c2,3.46 3,7.26 3,11.06 -0,3.8 -1,7.61 -3,11.08 -4,6.94 -11.18,11.08 -19.19,11.09h0ZM72.09,394.32c-0,3.46 17.6,-4 19.42,-0.85 3.65,6.31 -6.51,21 0.78,21 0,0 173.27,-3.83 176.91,-10.14 1.82,-3.16 2.73,-6.62 2.73,-10.08s-0.91,-6.92 -2.74,-10.08l-79.79,-145.01c-3.64,-6.29 -10.16,-10.06 -17.45,-10.06 -7.28,0 -99.86,161.75 -99.86,165.21h0Z"
+      android:fillColor="@color/primary_container"/>
+  <path
+      android:pathData="M253.52,414.42c-2,4 91.61,2.77 92.72,2.77 0,0 26.31,-0.58 26.86,-1.54 0.28,-0.48 0.41,-1.01 0.41,-1.53s-0.14,-1.05 -0.42,-1.53l-12.12,-22.02c-0.55,-0.96 -1.54,-1.53 -2.65,-1.53 -0.05,0 -0.11,0.04 -0.2,0.12 -16.16,14.44 -36.08,23.99 -57.76,24.31 -23.05,0.34 -46.73,0.69 -46.86,0.94h0Z"
+      android:fillColor="@color/primary_container"/>
+  <path
+      android:pathData="M403.88,411.31l-9.04,0l-4.31,-34.89l13.35,-0l0.01,34.89z"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M372.89,411.11h0c-0.28,0.47 -0.43,2.01 -0.43,2.56h0c0,1.7 1.38,3.07 3.07,3.07l28.01,-0.01c1.16,-0 2.09,-0.94 2.09,-2.09l-0,-1.17s1.38,-3.51 -1.47,-7.82c0,0 -3.54,3.38 -8.84,-1.91l-1.56,-2.83 -11.31,8.28 -6.27,0.77c-1.37,0.17 -2.59,-0.03 -3.29,1.16h-0Z"
+      android:fillColor="@color/drawable_darker"/>
+  <path
+      android:pathData="M369.2,381.47l-8.57,2.9l-15.26,-31.67l12.64,-4.28l11.18,33.05z"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M339.78,391.21h0c-0.11,0.54 0.24,2.04 0.41,2.56h0c0.54,1.61 2.29,2.47 3.89,1.92l26.53,-8.98c1.1,-0.37 1.68,-1.56 1.31,-2.66l-0.37,-1.1s0.19,-3.76 -3.9,-6.94c0,0 -2.27,4.34 -8.99,1.02l-2.39,-2.18 -8.06,11.46 -5.69,2.74c-1.24,0.6 -2.46,0.8 -2.75,2.16l-0,0Z"
+      android:fillColor="@color/drawable_darker"/>
+  <path
+      android:pathData="M355.23,179.09l-17.54,58.1l-20.71,52.26l32.79,74.63l12.16,-5.41l-14.55,-68.56l30.51,-46.52l14.24,145.23l12.16,-0.68l16.49,-175.3l2.35,-38.17l-67.89,4.41z"
+      android:fillColor="@color/drawable_darker"/>
+  <path
+      android:pathData="M408.21,50.39l-25.67,4.74 -2.02,11.48 -15.53,7.44 -8.08,84.44s-13.5,17.57 -2.69,22.97l68.9,-6.78s3.37,-12.49 -0,-13.68 -3.39,-31.02 -3.39,-31.02l15.52,-61.37 -22.97,-8.1 -4.06,-10.13Z"
+      android:fillColor="@color/drawable_lighter"/>
+  <path
+      android:pathData="M393.07,29.44m-20.73,0a20.73,20.73 0,1 1,41.46 0a20.73,20.73 0,1 1,-41.46 0"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M406.8,32.51c-1.65,0.91 -0.08,5.23 -1.12,5.6 -1.19,0.43 -5.55,-4.53 -5.61,-10.08 -0.02,-1.68 0.37,-2.49 -0,-4.48 -0.49,-2.61 -1.98,-5.68 -3.36,-5.6 -0.82,0.05 -1.62,1.21 -1.68,2.24 -0.08,1.45 1.32,2.02 1.12,2.8 -0.39,1.49 -6.3,2.51 -8.4,0 -1.65,-1.97 -0.38,-5.42 -1.12,-5.6 -0.54,-0.13 -1.13,1.77 -3.36,3.92 -0.84,0.81 -2.09,2.01 -2.8,1.68 -1.02,-0.48 -0.28,-3.88 -0.56,-3.92 -0.23,-0.04 -0.38,2.35 -1.68,4.48 -1.67,2.74 -5.11,4.85 -6.72,3.92 -0.98,-0.57 -1.06,-2.16 -1.12,-3.36 -0.12,-2.54 -3.81,-8.38 -2.86,-11.09 1.94,-5.53 5.27,-1.63 6.78,-3.48 2.04,-2.5 3.87,-1.15 7.28,-3.92 3.34,-2.71 3.37,-5.43 5.6,-5.6 2.01,-0.16 2.73,1.99 5.04,1.68 1.96,-0.26 2.39,-1.92 3.92,-1.68 1.4,0.22 1.5,1.69 3.36,2.24 1.19,0.35 1.45,-0.16 2.8,-0 2.81,0.33 4.69,2.88 5.04,3.36 1.36,1.85 0.83,2.62 2.24,4.48 1.22,1.6 3.91,0.92 4.92,1.72 3.31,2.61 4.73,7.43 4.76,12.93 0.02,3.84 -0.48,5.78 -1.6,10.64 -0.85,3.68 -4.78,8.44 -6.95,10.57 -0.58,0.57 -2.21,2.17 -3.36,1.68 -1.09,-0.46 -1.12,-2.53 -1.12,-2.8 -0,-0.94 0.25,-2.1 2.24,-5.04 2.09,-3.09 2.93,-3.44 2.8,-4.48 -0.22,-1.84 -3.16,-3.52 -4.48,-2.8h0Z"
+      android:fillColor="@color/drawable_darker"/>
+  <path
+      android:pathData="M334.49,225.76c-0.65,5.4 1.62,10.12 5.06,10.53s6.75,-3.64 7.39,-9.04c0.28,-2.36 0.01,-4.6 -0.68,-6.4l2.45,-22.93 -10.78,-0.92 -1.27,22.7c-1.09,1.59 -1.88,3.69 -2.17,6.06h0Z"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M365.49,73.5s-5.59,0.08 -9.29,7.3c-1.97,3.84 -12.48,75.63 -12.48,75.63l-9.69,58.81 16.5,0.08 12.86,-55.69 10.82,-32.3 -8.72,-53.83Z"
+      android:fillColor="@color/drawable_lighter"/>
+  <path
+      android:pathData="M411.93,217.13c-1.58,5.21 -0.18,10.24 3.14,11.25s7.28,-2.4 8.86,-7.61c0.69,-2.28 0.81,-4.53 0.45,-6.42l6.42,-22.15 -10.46,-2.79 -5.22,22.13c-1.35,1.37 -2.5,3.3 -3.19,5.58v-0Z"
+      android:fillColor="@color/tone_two"/>
+  <path
+      android:pathData="M423.42,69.63s8.1,-6.08 14.86,3.37c6.76,9.45 9.49,87.14 9.49,87.14l-18.9,47.97 -14.19,-4.72 13.49,-58.77 -23.66,-44.58 18.9,-30.4h-0Z"
+      android:fillColor="@color/drawable_lighter"/>
+  <path
+      android:pathData="M218.48,311.43m-73,0a73,73 0,1 1,146 0a73,73 0,1 1,-146 0"
+      android:fillColor="@color/primary_container"/>
+  <path
+      android:pathData="M218.49,349.48m-6.7,0a6.7,6.7 0,1 1,13.41 0a6.7,6.7 0,1 1,-13.41 0"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M218.46,266.68c-0.62,4.09 0.49,4.95 0.49,22.59 0.01,17.64 3.67,41.29 -0.47,41.29s-5.65,-48.8 -20.02,-53.12c-16.89,-5.08 21.99,-23.99 19.99,-10.75Z"
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 736d12e2..f3322fc5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,9 +3,11 @@
     <color name="ic_launcher_background">#152241</color>
     <color name="background">#152241</color>
     <color name="surface">#223260</color>
+    <color name="primary_container">#384670</color>
     <color name="drawable_lighter">#6F6C88</color>
     <color name="drawable_darker">#3F3d56</color>
     <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
     <color name="grey">#F2F2F2</color>
     <color name="tone_one">#97636b</color>
     <color name="tone_two">#FFB6B6</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 113d910c..50311ce9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,13 +31,13 @@
     <string name="empty_state_favourite_coins_title">No favourite coins</string>
     <string name="empty_state_favourite_coins_subtitle_start">Tap the</string>
     <string name="empty_state_favourite_coins_subtitle_end">to favourite a coin</string>
-    <string name="empty_state_coins_title">No coins</string>
-    <string name="empty_state_coins_subtitle">Please try again later</string>
+    <string name="empty_state_coins_title">Couldn\'t load coins</string>
+    <string name="empty_state_coins_subtitle">Check your internet connection</string>
     <string name="error_occurred">An error has occurred</string>
     <string name="cd_clear_search">Clear search</string>
     <string name="search_coins_hint">Search coins</string>
-    <string name="empty_state_search_title">No coins found</string>
-    <string name="empty_state_search_subtitle">Try adjusting your search</string>
+    <string name="empty_state_search_results_title">No coins found</string>
+    <string name="empty_state_search_results_subtitle">Try adjusting your search</string>
     <string name="empty_chart_message">No chart data available</string>
     <string name="empty_chart_range_message">No chart range data available</string>
     <string name="empty_chart_message_short">No chart data</string>
@@ -71,7 +71,7 @@
     <string name="cd_more">More</string>
     <string name="dropdown_option_settings">Settings</string>
     <string name="start_screen_title">Start screen</string>
-    <string name="settings_author">Made with ❤️️ by Short Labs</string>
+    <string name="settings_author">Made for you by Short Labs</string>
     <string name="settings_title_version">CoinWatch version</string>
     <string name="settings_title_source_code">Source code</string>
     <string name="settings_title_privacy_policy">Privacy policy</string>
@@ -90,4 +90,7 @@
     <string name="cd_expand_favourites">Expand favourites list</string>
     <string name="cd_condense_favourites">Condense favourites list</string>
     <string name="settings_title_currency">Currency</string>
+    <string name="empty_state_search_title">Explore coins</string>
+    <string name="empty_state_search_subtitle">Search by name or symbol</string>
+    <string name="start_screen_bottom_sheet_title">App start screen</string>
 </resources>