diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 7593f303e7..ac07841c19 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.tangem.TangemSdk
@@ -83,8 +84,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler {
     }
 
     private fun systemActions() {
-        // makes the status bar text dark
-        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
index c453cdadc4..4e8f7b62b6 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@@ -1,7 +1,10 @@
 package com.tangem.tap.features.home
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
@@ -15,48 +18,36 @@ import com.tangem.tap.features.home.redux.HomeState
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.features.tokens.redux.TokensAction
 import com.tangem.tap.store
-import com.tangem.wallet.R
 import org.rekotlin.StoreSubscriber
 
-class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState> {
+class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
 
-    var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
+    private var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
+    var composeView: ComposeView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         store.dispatch(HomeAction.Init)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        val context = container?.context ?: return null
 
         store.dispatch(BackupAction.CheckForUnfinishedBackup)
-
-
-        getView()?.findViewById<ComposeView>(R.id.cv_stories)?.setContent {
-            AppCompatTheme {
-                StoriesScreen(
-                    homeState,
-                    onScanButtonClick = { store.dispatch(HomeAction.ReadCard) },
-                    onShopButtonClick = {
-                        store.dispatch(HomeAction.GoToShop(store.state.globalState.userCountryCode))
-                    },
-                    onSearchTokensClick = {
-                        store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
-                        store.dispatch(TokensAction.AllowToAddTokens(false))
-                        store.dispatch(TokensAction.LoadCurrencies())
-                    }
-                )
+        composeView = ComposeView(context).apply {
+            setContent {
+                AppCompatTheme {
+                    ScreenContent()
+                }
             }
         }
-    }
 
-    private fun getRegionProvider(): RegionProvider = RegionService(
-        listOf(
-//            TelephonyManagerRegionProvider(requireContext()),
-            LocaleRegionProvider()
-        )
-    )
+        return composeView
+    }
 
     override fun onStart() {
         super.onStart()
@@ -72,6 +63,10 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
         store.unsubscribe(this)
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        composeView = null
+    }
 
     override fun newState(state: HomeState) {
         if (activity == null || view == null) return
@@ -79,4 +74,21 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
         homeState.value = state
     }
 
+    @Composable
+    private fun ScreenContent() {
+        StoriesScreen(
+            homeState,
+            onScanButtonClick = { store.dispatch(HomeAction.ReadCard) },
+            onShopButtonClick = {
+                store.dispatch(
+                    HomeAction.GoToShop(store.state.globalState.userCountryCode)
+                )
+            },
+            onSearchTokensClick = {
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
+                store.dispatch(TokensAction.AllowToAddTokens(false))
+                store.dispatch(TokensAction.LoadCurrencies())
+            }
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
similarity index 80%
rename from app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt
rename to app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
index 183392a4b4..7e840f5592 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
@@ -3,12 +3,25 @@ package com.tangem.tap.features.home.compose
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+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.systemBars
+import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -25,8 +38,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.tap.common.compose.SpacerS24
-import com.tangem.tap.features.home.compose.content.*
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.tangem.tap.features.home.compose.content.FirstStoriesContent
+import com.tangem.tap.features.home.compose.content.StoriesCurrencies
+import com.tangem.tap.features.home.compose.content.StoriesRevolutionaryWallet
+import com.tangem.tap.features.home.compose.content.StoriesUltraSecureBackup
+import com.tangem.tap.features.home.compose.content.StoriesWalletForEveryone
+import com.tangem.tap.features.home.compose.content.StoriesWeb3
 import com.tangem.tap.features.home.compose.views.HomeButtons
 import com.tangem.tap.features.home.compose.views.StoriesProgressBar
 import com.tangem.tap.features.home.redux.HomeState
@@ -43,6 +61,7 @@ fun StoriesScreen(
 ) {
     val steps = 6
     val currentStep = remember { mutableStateOf(1) }
+    val systemUiController = rememberSystemUiController()
 
     val isDarkBackground = currentStep.value !in 3..5
 
@@ -60,13 +79,20 @@ fun StoriesScreen(
 
     val hideContent = remember { mutableStateOf(true) }
 
+    SideEffect {
+        systemUiController.setSystemBarsColor(
+            color = Color.Transparent,
+            darkIcons = false,
+        )
+    }
+
     Box(
-        Modifier
+        modifier = Modifier
             .fillMaxSize()
             .background(Color(0xFF090E13))
     ) {
         Row(
-            Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize()
         ) {
             Box(
                 Modifier
@@ -107,19 +133,23 @@ fun StoriesScreen(
         }
         if (!isDarkBackground) {
             Image(
+                modifier = Modifier.fillMaxSize(),
                 painter = painterResource(id = R.drawable.ic_overlay),
                 contentDescription = null,
-                modifier = Modifier
-                    .fillMaxSize(),
                 contentScale = ContentScale.FillBounds
             )
         }
+
+        val insets = WindowInsets.systemBars
+            .union(WindowInsets(top = 32.dp))
+
         Column(
+            modifier = Modifier
+                .windowInsetsPadding(insets)
+                .fillMaxSize(),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
-            modifier = Modifier.fillMaxWidth()
         ) {
-            SpacerS24()
             StoriesProgressBar(
                 steps = steps,
                 currentStep = currentStep.value,
diff --git a/app/src/main/res/drawable/ic_overlay.xml b/app/src/main/res/drawable/ic_overlay.xml
index 586397f855..5487da88f8 100644
--- a/app/src/main/res/drawable/ic_overlay.xml
+++ b/app/src/main/res/drawable/ic_overlay.xml
@@ -4,10 +4,18 @@
     <path android:fillColor="#F8F9F9" android:pathData="M0,0h360v720h-360z"/>
     <path android:fillAlpha="0.2" android:pathData="M0,0h360v720h-360z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="179.591" android:endY="82.4634"
-                android:startX="180" android:startY="0" android:type="linear">
-                <item android:color="#FF090E13" android:offset="0"/>
-                <item android:color="#00000000" android:offset="1"/>
+            <gradient
+                    android:endX="179.591"
+                    android:endY="120.4634"
+                    android:startX="180"
+                    android:startY="0"
+                    android:type="linear">
+                <item
+                        android:color="#FF090E13"
+                        android:offset="0" />
+                <item
+                        android:color="#00000000"
+                        android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
deleted file mode 100644
index 7a95116cd8..0000000000
--- a/app/src/main/res/layout/fragment_home.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/cv_stories"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f36d1cd4bf..09cdff0b35 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,10 +5,6 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorSecondary">@color/colorSecondary</item>
         <item name="android:textColor">@color/darkGray6</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowContentOverlay">@null</item>
         <item name="actionMenuTextColor">@color/menu_accent_color</item>
 
         <item name="materialCardViewStyle">@style/Widget.AppTheme.CardView</item>