diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfFragment.kt
index f9c864048a..aaea82b618 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfFragment.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfFragment.kt
@@ -150,7 +150,7 @@ fun EtfPage(
                                 DescriptionCard(
                                     title,
                                     description,
-                                    ImageSource.Remote("https://cdn.blocksdecoded.com/category-icons/lending@3x.png")
+                                    ImageSource.Remote("https://cdn.blocksdecoded.com/header-images/ETF_bitcoin@3x.png")
                                 )
                             }
                             item {
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfViewModel.kt
index 7ef4c3c6d2..43d7cd836b 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfViewModel.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/etf/EtfViewModel.kt
@@ -116,7 +116,7 @@ class EtfViewModel(
 
     private fun etfViewItem(etf: Etf, timeDuration: TimeDuration) = EtfViewItem(
         title = etf.ticker,
-        iconUrl = "https://cdn.blocksdecoded.com/header-images/${etf.ticker.lowercase()}@3x.png",
+        iconUrl = "https://cdn.blocksdecoded.com/etf-tresuries/${etf.ticker}@3x.png",
         subtitle = etf.name,
         value = etf.totalAssets?.let {
             App.numberFormatter.formatFiatShort(it, currencyManager.baseCurrency.symbol, 0)
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/metricspage/MetricsPageViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/metricspage/MetricsPageViewModel.kt
index 8c7aa67894..c63e0acca8 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/metricspage/MetricsPageViewModel.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/metricspage/MetricsPageViewModel.kt
@@ -62,10 +62,16 @@ class MetricsPageViewModel(
         else -> throw Exception("MetricsType not supported")
     }
 
+    private val icon = when(metricsType) {
+        MetricsType.Volume24h -> "total_volume"
+        MetricsType.TotalMarketCap -> "total_mcap"
+        else -> throw Exception("MetricsType not supported")
+    }
+
     private val header = MarketModule.Header(
         title = Translator.getString(title),
         description = Translator.getString(description),
-        icon = ImageSource.Remote("https://cdn.blocksdecoded.com/header-images/total_volume@3x.png")
+        icon = ImageSource.Remote("https://cdn.blocksdecoded.com/header-images/$icon@3x.png")
     )
 
     override fun createState(): MetricsPageModule.UiState {
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/posts/MarketPostService.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/posts/MarketPostService.kt
index 42777e324a..83ad41ddd2 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/posts/MarketPostService.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/posts/MarketPostService.kt
@@ -18,7 +18,7 @@ class MarketPostService(
     private val backgroundManager: BackgroundManager,
 ) : BackgroundManager.Listener {
     private val coroutineScope = CoroutineScope(Dispatchers.Default)
-    private var xxxJob: Job? = null
+    private var job: Job? = null
 
     private val stateSubject = BehaviorSubject.create<DataState<List<Post>>>()
     val stateObservable: Observable<DataState<List<Post>>>
@@ -26,12 +26,11 @@ class MarketPostService(
 
     init {
         backgroundManager.registerListener(this)
-        fetchPosts()
     }
 
     private fun fetchPosts() {
-        xxxJob?.cancel()
-        xxxJob = coroutineScope.launch {
+        job?.cancel()
+        job = coroutineScope.launch {
             try {
                 val posts = marketKit.postsSingle().await()
                 stateSubject.onNext(DataState.Success(posts))