diff --git a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
index b66ed0a3ad..a913befc98 100644
--- a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
@@ -4,6 +4,9 @@ import android.content.Context
import android.net.Uri
import androidx.browser.customtabs.CustomTabColorSchemeParams
import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_DARK
+import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_LIGHT
+import com.tangem.tap.common.apptheme.MutableAppThemeModeHolder
import com.tangem.tap.common.extensions.getColorCompat
import com.tangem.wallet.R
@@ -15,6 +18,9 @@ class CustomTabsManager {
.setNavigationBarColor(context.getColorCompat(R.color.toolbarColor))
.build(),
)
+ .setColorScheme(
+ if (MutableAppThemeModeHolder.isDarkThemeActive) COLOR_SCHEME_DARK else COLOR_SCHEME_LIGHT,
+ )
.build()
customTabsIntent.launchUrl(context, Uri.parse(url))
}
diff --git a/app/src/main/res/drawable-night/ic_arbitrum_no_color.xml b/app/src/main/res/drawable-night/ic_arbitrum_no_color.xml
deleted file mode 100644
index d27c75195b..0000000000
--- a/app/src/main/res/drawable-night/ic_arbitrum_no_color.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_avalanche_no_color.xml b/app/src/main/res/drawable-night/ic_avalanche_no_color.xml
deleted file mode 100644
index 84bb62ad1e..0000000000
--- a/app/src/main/res/drawable-night/ic_avalanche_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_bitcoin_cash_no_color.xml b/app/src/main/res/drawable-night/ic_bitcoin_cash_no_color.xml
deleted file mode 100644
index 501c006728..0000000000
--- a/app/src/main/res/drawable-night/ic_bitcoin_cash_no_color.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_bitcoin_no_color.xml b/app/src/main/res/drawable-night/ic_bitcoin_no_color.xml
deleted file mode 100644
index 84b7fa673d..0000000000
--- a/app/src/main/res/drawable-night/ic_bitcoin_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_bsc_no_color.xml b/app/src/main/res/drawable-night/ic_bsc_no_color.xml
deleted file mode 100644
index 7a6e69d0d0..0000000000
--- a/app/src/main/res/drawable-night/ic_bsc_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_cardano_no_color.xml b/app/src/main/res/drawable-night/ic_cardano_no_color.xml
deleted file mode 100644
index 688149e946..0000000000
--- a/app/src/main/res/drawable-night/ic_cardano_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_chia_no_color.xml b/app/src/main/res/drawable-night/ic_chia_no_color.xml
deleted file mode 100644
index a8beb8b71e..0000000000
--- a/app/src/main/res/drawable-night/ic_chia_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_cosmos_no_color.xml b/app/src/main/res/drawable-night/ic_cosmos_no_color.xml
deleted file mode 100644
index 42e2426955..0000000000
--- a/app/src/main/res/drawable-night/ic_cosmos_no_color.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_cronos_no_color.xml b/app/src/main/res/drawable-night/ic_cronos_no_color.xml
deleted file mode 100644
index 95c7b20aa0..0000000000
--- a/app/src/main/res/drawable-night/ic_cronos_no_color.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_dash_no_color.xml b/app/src/main/res/drawable-night/ic_dash_no_color.xml
deleted file mode 100644
index cbe04a6a95..0000000000
--- a/app/src/main/res/drawable-night/ic_dash_no_color.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_dogecoin_no_color.xml b/app/src/main/res/drawable-night/ic_dogecoin_no_color.xml
deleted file mode 100644
index 0c20ff8559..0000000000
--- a/app/src/main/res/drawable-night/ic_dogecoin_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_eth_no_color.xml b/app/src/main/res/drawable-night/ic_eth_no_color.xml
deleted file mode 100644
index ff2ec1be37..0000000000
--- a/app/src/main/res/drawable-night/ic_eth_no_color.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_ethereumfair_no_color.xml b/app/src/main/res/drawable-night/ic_ethereumfair_no_color.xml
deleted file mode 100644
index 97dbf4686f..0000000000
--- a/app/src/main/res/drawable-night/ic_ethereumfair_no_color.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_ethereumpow_no_color.xml b/app/src/main/res/drawable-night/ic_ethereumpow_no_color.xml
deleted file mode 100644
index 15e4b3efd0..0000000000
--- a/app/src/main/res/drawable-night/ic_ethereumpow_no_color.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_fantom_no_color.xml b/app/src/main/res/drawable-night/ic_fantom_no_color.xml
deleted file mode 100644
index bbb7044103..0000000000
--- a/app/src/main/res/drawable-night/ic_fantom_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_gnosis_no_color.xml b/app/src/main/res/drawable-night/ic_gnosis_no_color.xml
deleted file mode 100644
index fb21b7ec5b..0000000000
--- a/app/src/main/res/drawable-night/ic_gnosis_no_color.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_kaspa_no_color.xml b/app/src/main/res/drawable-night/ic_kaspa_no_color.xml
deleted file mode 100644
index d245591015..0000000000
--- a/app/src/main/res/drawable-night/ic_kaspa_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_kava_no_color.xml b/app/src/main/res/drawable-night/ic_kava_no_color.xml
deleted file mode 100644
index 52132dd8db..0000000000
--- a/app/src/main/res/drawable-night/ic_kava_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_kusama_no_color.xml b/app/src/main/res/drawable-night/ic_kusama_no_color.xml
deleted file mode 100644
index d2601e7684..0000000000
--- a/app/src/main/res/drawable-night/ic_kusama_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_litecoin_no_color.xml b/app/src/main/res/drawable-night/ic_litecoin_no_color.xml
deleted file mode 100644
index da1b438b7e..0000000000
--- a/app/src/main/res/drawable-night/ic_litecoin_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_octaspace_no_color.xml b/app/src/main/res/drawable-night/ic_octaspace_no_color.xml
deleted file mode 100644
index 3483ed7be3..0000000000
--- a/app/src/main/res/drawable-night/ic_octaspace_no_color.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_optimism_no_color.xml b/app/src/main/res/drawable-night/ic_optimism_no_color.xml
deleted file mode 100644
index 9a28dabb2f..0000000000
--- a/app/src/main/res/drawable-night/ic_optimism_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_polkadot_no_color.xml b/app/src/main/res/drawable-night/ic_polkadot_no_color.xml
deleted file mode 100644
index cc9d9d2179..0000000000
--- a/app/src/main/res/drawable-night/ic_polkadot_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_polygon_no_color.xml b/app/src/main/res/drawable-night/ic_polygon_no_color.xml
deleted file mode 100644
index bfd632c93a..0000000000
--- a/app/src/main/res/drawable-night/ic_polygon_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_ravencoin_no_color.xml b/app/src/main/res/drawable-night/ic_ravencoin_no_color.xml
deleted file mode 100644
index 428b851f0e..0000000000
--- a/app/src/main/res/drawable-night/ic_ravencoin_no_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_rsk_no_color.xml b/app/src/main/res/drawable-night/ic_rsk_no_color.xml
deleted file mode 100644
index 8a1fc2a678..0000000000
--- a/app/src/main/res/drawable-night/ic_rsk_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_solana_no_color.xml b/app/src/main/res/drawable-night/ic_solana_no_color.xml
deleted file mode 100644
index ac1bb7c565..0000000000
--- a/app/src/main/res/drawable-night/ic_solana_no_color.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_stellar_no_color.xml b/app/src/main/res/drawable-night/ic_stellar_no_color.xml
deleted file mode 100644
index e87b7c5061..0000000000
--- a/app/src/main/res/drawable-night/ic_stellar_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_telos_no_color.xml b/app/src/main/res/drawable-night/ic_telos_no_color.xml
deleted file mode 100644
index b853488d28..0000000000
--- a/app/src/main/res/drawable-night/ic_telos_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_terra2_no_color.xml b/app/src/main/res/drawable-night/ic_terra2_no_color.xml
deleted file mode 100644
index 2ac3b44b03..0000000000
--- a/app/src/main/res/drawable-night/ic_terra2_no_color.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_terra_no_color.xml b/app/src/main/res/drawable-night/ic_terra_no_color.xml
deleted file mode 100644
index 26d8fe8e4b..0000000000
--- a/app/src/main/res/drawable-night/ic_terra_no_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_tezos_no_color.xml b/app/src/main/res/drawable-night/ic_tezos_no_color.xml
deleted file mode 100644
index 8976ad0a0e..0000000000
--- a/app/src/main/res/drawable-night/ic_tezos_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_ton_no_color.xml b/app/src/main/res/drawable-night/ic_ton_no_color.xml
deleted file mode 100644
index 098b3a6883..0000000000
--- a/app/src/main/res/drawable-night/ic_ton_no_color.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_tron_no_color.xml b/app/src/main/res/drawable-night/ic_tron_no_color.xml
deleted file mode 100644
index 581cf60d6a..0000000000
--- a/app/src/main/res/drawable-night/ic_tron_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/ic_xrp_no_color.xml b/app/src/main/res/drawable-night/ic_xrp_no_color.xml
deleted file mode 100644
index 9c4d2e9b43..0000000000
--- a/app/src/main/res/drawable-night/ic_xrp_no_color.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/card_placeholder_black.xml b/app/src/main/res/drawable/card_placeholder_black.xml
deleted file mode 100644
index 83fab8e0f7..0000000000
--- a/app/src/main/res/drawable/card_placeholder_black.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_arbitrum_no_color.xml b/app/src/main/res/drawable/ic_arbitrum_no_color.xml
index 02164f7121..e7c20e844b 100644
--- a/app/src/main/res/drawable/ic_arbitrum_no_color.xml
+++ b/app/src/main/res/drawable/ic_arbitrum_no_color.xml
@@ -3,7 +3,6 @@
android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-
diff --git a/app/src/main/res/drawable/ic_avalanche_no_color.xml b/app/src/main/res/drawable/ic_avalanche_no_color.xml
index 72317338ab..032533db9d 100644
--- a/app/src/main/res/drawable/ic_avalanche_no_color.xml
+++ b/app/src/main/res/drawable/ic_avalanche_no_color.xml
@@ -1,6 +1,11 @@
-
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_azero_no_color.xml b/app/src/main/res/drawable/ic_azero_no_color.xml
index da712895b3..612a316f3f 100644
--- a/app/src/main/res/drawable/ic_azero_no_color.xml
+++ b/app/src/main/res/drawable/ic_azero_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
diff --git a/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml b/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml
index 8ca8b29ddb..f9a1276588 100644
--- a/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml
+++ b/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml
@@ -1,6 +1,5 @@
-
diff --git a/app/src/main/res/drawable/ic_bitcoin_no_color.xml b/app/src/main/res/drawable/ic_bitcoin_no_color.xml
index 9b8aef2452..b18c3c9cce 100644
--- a/app/src/main/res/drawable/ic_bitcoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_bitcoin_no_color.xml
@@ -1,6 +1,5 @@
-
diff --git a/app/src/main/res/drawable/ic_bsc_no_color.xml b/app/src/main/res/drawable/ic_bsc_no_color.xml
index 1fb72febdf..a7062f73c1 100644
--- a/app/src/main/res/drawable/ic_bsc_no_color.xml
+++ b/app/src/main/res/drawable/ic_bsc_no_color.xml
@@ -1,7 +1,6 @@
-
diff --git a/app/src/main/res/drawable/ic_cardano_no_color.xml b/app/src/main/res/drawable/ic_cardano_no_color.xml
index ea706040d3..46a9df7709 100644
--- a/app/src/main/res/drawable/ic_cardano_no_color.xml
+++ b/app/src/main/res/drawable/ic_cardano_no_color.xml
@@ -1,6 +1,5 @@
-
diff --git a/app/src/main/res/drawable/ic_chia_no_color.xml b/app/src/main/res/drawable/ic_chia_no_color.xml
index 9119f89479..4ed5d9574b 100644
--- a/app/src/main/res/drawable/ic_chia_no_color.xml
+++ b/app/src/main/res/drawable/ic_chia_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
-
-
diff --git a/app/src/main/res/drawable/ic_dash_no_color.xml b/app/src/main/res/drawable/ic_dash_no_color.xml
index be475ecf51..0e7c3f29b6 100644
--- a/app/src/main/res/drawable/ic_dash_no_color.xml
+++ b/app/src/main/res/drawable/ic_dash_no_color.xml
@@ -6,9 +6,6 @@
-
diff --git a/app/src/main/res/drawable/ic_dogecoin_no_color.xml b/app/src/main/res/drawable/ic_dogecoin_no_color.xml
index 8ca48b696e..9d52af3530 100644
--- a/app/src/main/res/drawable/ic_dogecoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_dogecoin_no_color.xml
@@ -1,6 +1,5 @@
-
diff --git a/app/src/main/res/drawable/ic_eth_no_color.xml b/app/src/main/res/drawable/ic_eth_no_color.xml
index 95066b1560..41071ba559 100644
--- a/app/src/main/res/drawable/ic_eth_no_color.xml
+++ b/app/src/main/res/drawable/ic_eth_no_color.xml
@@ -1,7 +1,6 @@
-
diff --git a/app/src/main/res/drawable/ic_ethereumfair_no_color.xml b/app/src/main/res/drawable/ic_ethereumfair_no_color.xml
index dd68efa83e..1379276e0d 100644
--- a/app/src/main/res/drawable/ic_ethereumfair_no_color.xml
+++ b/app/src/main/res/drawable/ic_ethereumfair_no_color.xml
@@ -6,9 +6,6 @@
android:viewportHeight="22">
-
diff --git a/app/src/main/res/drawable/ic_ethereumpow_no_color.xml b/app/src/main/res/drawable/ic_ethereumpow_no_color.xml
index aa369fd0ab..40a0651a32 100644
--- a/app/src/main/res/drawable/ic_ethereumpow_no_color.xml
+++ b/app/src/main/res/drawable/ic_ethereumpow_no_color.xml
@@ -6,9 +6,6 @@
android:viewportHeight="22">
-
-
diff --git a/app/src/main/res/drawable/ic_gnosis_no_color.xml b/app/src/main/res/drawable/ic_gnosis_no_color.xml
index a8d4069093..271d24efd6 100644
--- a/app/src/main/res/drawable/ic_gnosis_no_color.xml
+++ b/app/src/main/res/drawable/ic_gnosis_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
diff --git a/app/src/main/res/drawable/ic_kaspa_no_color.xml b/app/src/main/res/drawable/ic_kaspa_no_color.xml
index cae1a10de8..55b68fd581 100644
--- a/app/src/main/res/drawable/ic_kaspa_no_color.xml
+++ b/app/src/main/res/drawable/ic_kaspa_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
diff --git a/app/src/main/res/drawable/ic_kava_no_color.xml b/app/src/main/res/drawable/ic_kava_no_color.xml
index d48b77cede..49e4647c33 100644
--- a/app/src/main/res/drawable/ic_kava_no_color.xml
+++ b/app/src/main/res/drawable/ic_kava_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
-
diff --git a/app/src/main/res/drawable/ic_litecoin_no_color.xml b/app/src/main/res/drawable/ic_litecoin_no_color.xml
index 5758f1ab6e..5b3acc91e8 100644
--- a/app/src/main/res/drawable/ic_litecoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_litecoin_no_color.xml
@@ -1,9 +1,10 @@
-
-
-
-
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_octaspace_no_color.xml b/app/src/main/res/drawable/ic_octaspace_no_color.xml
index 36751027a3..c61e79358f 100644
--- a/app/src/main/res/drawable/ic_octaspace_no_color.xml
+++ b/app/src/main/res/drawable/ic_octaspace_no_color.xml
@@ -4,9 +4,6 @@
android:autoMirrored="true"
android:viewportWidth="22"
android:viewportHeight="22">
-
diff --git a/app/src/main/res/drawable/ic_optimism_no_color.xml b/app/src/main/res/drawable/ic_optimism_no_color.xml
index 3a9d21620b..7091ff4c7d 100644
--- a/app/src/main/res/drawable/ic_optimism_no_color.xml
+++ b/app/src/main/res/drawable/ic_optimism_no_color.xml
@@ -5,9 +5,6 @@
android:viewportHeight="22">
-
-
diff --git a/app/src/main/res/drawable/ic_polygon_no_color.xml b/app/src/main/res/drawable/ic_polygon_no_color.xml
index 665486d682..eafe18126e 100644
--- a/app/src/main/res/drawable/ic_polygon_no_color.xml
+++ b/app/src/main/res/drawable/ic_polygon_no_color.xml
@@ -1,6 +1,5 @@
-
diff --git a/app/src/main/res/drawable/ic_ravencoin_no_color.xml b/app/src/main/res/drawable/ic_ravencoin_no_color.xml
index 5bc49c57cf..7599b5c971 100644
--- a/app/src/main/res/drawable/ic_ravencoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_ravencoin_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
-
diff --git a/app/src/main/res/drawable/ic_solana_no_color.xml b/app/src/main/res/drawable/ic_solana_no_color.xml
index a49a56f643..31e6195232 100644
--- a/app/src/main/res/drawable/ic_solana_no_color.xml
+++ b/app/src/main/res/drawable/ic_solana_no_color.xml
@@ -1,6 +1,5 @@
-
diff --git a/app/src/main/res/drawable/ic_stellar_no_color.xml b/app/src/main/res/drawable/ic_stellar_no_color.xml
index 27a497f3fb..61e3683e6f 100644
--- a/app/src/main/res/drawable/ic_stellar_no_color.xml
+++ b/app/src/main/res/drawable/ic_stellar_no_color.xml
@@ -3,7 +3,6 @@
android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-
diff --git a/app/src/main/res/drawable/ic_telos_no_color.xml b/app/src/main/res/drawable/ic_telos_no_color.xml
index 01aca1d2b2..bdd073cd40 100644
--- a/app/src/main/res/drawable/ic_telos_no_color.xml
+++ b/app/src/main/res/drawable/ic_telos_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
-
diff --git a/app/src/main/res/drawable/ic_terra_no_color.xml b/app/src/main/res/drawable/ic_terra_no_color.xml
index 0ba5bf40f7..f25adb981e 100644
--- a/app/src/main/res/drawable/ic_terra_no_color.xml
+++ b/app/src/main/res/drawable/ic_terra_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
diff --git a/app/src/main/res/drawable/ic_tezos_no_color.xml b/app/src/main/res/drawable/ic_tezos_no_color.xml
index c023c94fa3..a929bead46 100644
--- a/app/src/main/res/drawable/ic_tezos_no_color.xml
+++ b/app/src/main/res/drawable/ic_tezos_no_color.xml
@@ -1,6 +1,5 @@
-
diff --git a/app/src/main/res/drawable/ic_ton_no_color.xml b/app/src/main/res/drawable/ic_ton_no_color.xml
index c3d5d856db..e9ecd65434 100644
--- a/app/src/main/res/drawable/ic_ton_no_color.xml
+++ b/app/src/main/res/drawable/ic_ton_no_color.xml
@@ -3,9 +3,6 @@
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
-
-
diff --git a/app/src/main/res/drawable/ic_xrp_no_color.xml b/app/src/main/res/drawable/ic_xrp_no_color.xml
index 67185b115a..47a43000ca 100644
--- a/app/src/main/res/drawable/ic_xrp_no_color.xml
+++ b/app/src/main/res/drawable/ic_xrp_no_color.xml
@@ -1,6 +1,10 @@
-
-
-
+
+
diff --git a/app/src/main/res/layout/layout_pseudo_toolbar.xml b/app/src/main/res/layout/layout_pseudo_toolbar.xml
index 0f9b853f36..361f8cbb40 100644
--- a/app/src/main/res/layout/layout_pseudo_toolbar.xml
+++ b/app/src/main/res/layout/layout_pseudo_toolbar.xml
@@ -4,7 +4,7 @@
android:id="@+id/pseudo_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:background="@color/background_action"
+ android:background="@color/background_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 1acebccb4b..1b1466a874 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -50,4 +50,5 @@
#919191
+ #333333
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cf46dfba11..5d49d88d30 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -80,4 +80,6 @@
#000000
#00000000
+
+ #1B1D1C
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
index 2575fee4ad..6f09757064 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
@@ -9,29 +9,11 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.InteractionSource
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldColors
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.material.*
+import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
@@ -210,8 +192,8 @@ object TangemTextFieldsDefault {
cursorColor = TangemTheme.colors.icon.primary1,
errorCursorColor = TangemTheme.colors.icon.warning,
focusedIndicatorColor = TangemTheme.colors.icon.primary1,
- unfocusedIndicatorColor = TangemTheme.colors.stroke.primary,
- disabledIndicatorColor = TangemTheme.colors.stroke.primary,
+ unfocusedIndicatorColor = TangemTheme.colors.stroke.secondary,
+ disabledIndicatorColor = TangemTheme.colors.stroke.secondary,
errorIndicatorColor = TangemTheme.colors.icon.warning,
leadingIconColor = TangemTheme.colors.icon.informative,
disabledLeadingIconColor = Color.Transparent,
diff --git a/core/ui/src/main/res/drawable-night/card_placeholder_black.webp b/core/ui/src/main/res/drawable-night/card_placeholder_black.webp
new file mode 100644
index 0000000000..376f120041
Binary files /dev/null and b/core/ui/src/main/res/drawable-night/card_placeholder_black.webp differ
diff --git a/core/ui/src/main/res/drawable/card_placeholder_black.webp b/core/ui/src/main/res/drawable/card_placeholder_black.webp
new file mode 100644
index 0000000000..b7077165a5
Binary files /dev/null and b/core/ui/src/main/res/drawable/card_placeholder_black.webp differ
diff --git a/core/ui/src/main/res/drawable/card_placeholder_black.xml b/core/ui/src/main/res/drawable/card_placeholder_black.xml
deleted file mode 100644
index 83fab8e0f7..0000000000
--- a/core/ui/src/main/res/drawable/card_placeholder_black.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
index a5f8b658ec..bfd13ad8c8 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
@@ -59,6 +59,7 @@ internal fun SwapScreen(stateHolder: SwapStateHolder) {
topEnd = TangemTheme.dimens.radius16,
),
sheetElevation = TangemTheme.dimens.elevation24,
+ scrimColor = TangemTheme.colors.background.secondary.copy(alpha = 0.4f),
content = {
SwapScreenContent(
state = stateHolder,
diff --git a/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp b/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp
new file mode 100644
index 0000000000..329d1f977e
Binary files /dev/null and b/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp differ