diff --git a/core/ui/src/main/java/com/tangem/core/ui/ds/message/TangemMessage.kt b/core/ui/src/main/java/com/tangem/core/ui/ds/message/TangemMessage.kt
index 45e60128ee..5e5ae2eb8d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/ds/message/TangemMessage.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/ds/message/TangemMessage.kt
@@ -83,12 +83,16 @@ fun TangemMessage(
         trailingContent = if (isIconLeading) null else icon,
         contentColor = contentColor,
         onCloseClick = messageUM.onCloseClick,
-        buttons = {
-            messageUM.buttonsUM.fastForEach { buttonUM ->
-                TangemButton(
-                    buttonUM = buttonUM.tangemButtonUM,
-                    modifier = Modifier.weight(1f),
-                )
+        buttons = if (messageUM.buttonsUM.isEmpty()) {
+            null
+        } else {
+            {
+                messageUM.buttonsUM.fastForEach { buttonUM ->
+                    TangemButton(
+                        buttonUM = buttonUM.tangemButtonUM,
+                        modifier = Modifier.weight(1f),
+                    )
+                }
             }
         },
     )
diff --git a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt
index 9df57ca897..d09ecd8cc7 100644
--- a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt
+++ b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt
@@ -214,7 +214,11 @@ internal class DefaultFeedEntryComponent @AssistedInject constructor(
 
     private fun onChildBack() {
         if (stack.value.active.configuration !is FeedEntryChildFactory.Child.Feed) {
-            stackNavigation.pop()
+            if (stack.value.backStack.isEmpty()) {
+                router.pop()
+            } else {
+                stackNavigation.pop()
+            }
         }
     }
 
diff --git a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/list/DefaultMarketsTokenListComponent.kt b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/list/DefaultMarketsTokenListComponent.kt
index ceaa6edccd..ab0c54f7c1 100644
--- a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/list/DefaultMarketsTokenListComponent.kt
+++ b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/list/DefaultMarketsTokenListComponent.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
@@ -24,6 +25,7 @@ import com.tangem.core.ui.components.bottomsheets.state.BottomSheetState
 import com.tangem.core.ui.components.haze.hazeEffectTangem
 import com.tangem.core.ui.decompose.ComposableModularBottomSheetContentComponent
 import com.tangem.core.ui.extensions.clickableSingle
+import com.tangem.core.ui.extensions.conditional
 import com.tangem.core.ui.res.LocalMainBottomSheetColor
 import com.tangem.core.ui.res.LocalRedesignEnabled
 import com.tangem.core.ui.res.TangemTheme
@@ -56,11 +58,13 @@ internal class DefaultMarketsTokenListComponent(
         val bsState by bottomSheetState
 
         if (LocalRedesignEnabled.current) {
-            val background = LocalMainBottomSheetColor.current.value
+            val bottomSheetColor = LocalMainBottomSheetColor.current.value
             FeedSearchBar(
                 isSearchBarClickable = bottomSheetState.value == BottomSheetState.EXPANDED,
                 feedListSearchBar = state.feedListSearchBar,
-                modifier = Modifier.background(background.copy(alpha = .95f)),
+                modifier = Modifier.conditional(bottomSheetColor.isSpecified) {
+                    background(bottomSheetColor.copy(alpha = .95f))
+                },
                 startContent = {
                     Icon(
                         imageVector = ImageVector.vectorResource(id = R.drawable.ic_arrow_back_28),
diff --git a/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt b/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt
index 1d13b403b0..2636ca256e 100644
--- a/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt
+++ b/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt
@@ -191,6 +191,7 @@ private fun SmoothHeightPager(
             BannerNotification(
                 config = banners[lowerPage].config,
                 containerColor = containerColor,
+                modifier = Modifier.padding(horizontal = horizontalPadding),
             )
         }.first().measure(pageConstraints).height
 
@@ -199,6 +200,7 @@ private fun SmoothHeightPager(
                 BannerNotification(
                     config = banners[upperPage].config,
                     containerColor = containerColor,
+                    modifier = Modifier.padding(horizontal = horizontalPadding),
                 )
             }.first().measure(pageConstraints).height
         } else {