diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt
index d28d81d0f9..94ac274ac6 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt
@@ -12,17 +12,14 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.components.SpacerH32
 import com.tangem.core.ui.components.SpacerW8
@@ -62,10 +59,7 @@ fun AboutSeedPhraseScreen(
                 ReadMoreBlock(state)
             }
         }
-
-        Box(
-            modifier = Modifier.wrapContentSize(),
-        ) {
+        Box {
             OnboardingActionBlock(
                 firstActionContent = {
                     SecondaryButton(
@@ -105,13 +99,15 @@ private fun EditIconBlock() {
             modifier = Modifier
                 .size(TangemTheme.dimens.size44),
             painter = painterResource(id = R.drawable.ic_onboarding_text_edit_56),
-            contentDescription = "Edit icon",
+            contentDescription = null,
         )
         SpacerH32()
         Box(
             modifier = Modifier
-                .clip(RoundedCornerShape(TangemTheme.dimens.radius8))
-                .background(TangemTheme.colors.icon.warning.copy(alpha = 0.12f)),
+                .background(
+                    color = TangemTheme.colors.icon.warning.copy(alpha = 0.12f),
+                    shape = RoundedCornerShape(TangemTheme.dimens.radius8),
+                ),
         ) {
             Text(
                 modifier = Modifier
@@ -141,8 +137,8 @@ private fun ReadMoreBlock(state: AboutState) {
                 .align(Alignment.Center)
                 .clip(shape)
                 .border(
-                    width = 1.dp,
-                    color = Color.Gray,
+                    width = TangemTheme.dimens.size1,
+                    color = TangemTheme.colors.stroke.primary,
                     shape = shape,
                 )
                 .clickable(onClick = state.buttonReadMoreAboutSeedPhrase.onClick)
@@ -153,7 +149,7 @@ private fun ReadMoreBlock(state: AboutState) {
         ) {
             Image(
                 painter = painterResource(id = R.drawable.ic_arrow_top_right_24),
-                contentDescription = "Go away icon",
+                contentDescription = null,
             )
             SpacerW8()
             Text(
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
index cbb84d7bc2..82618a84a9 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
@@ -12,7 +12,6 @@ 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.wrapContentSize
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
@@ -60,9 +59,7 @@ fun ImportSeedPhraseScreen(
                 )
             }
         }
-        Box(
-            modifier = Modifier.wrapContentSize(),
-        ) {
+        Box {
             OnboardingActionBlock(
                 firstActionContent = {
                     PrimaryButtonIconLeft(
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt
index a865f937af..2b57d09193 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -51,9 +50,7 @@ fun IntroScreen(
                 )
             }
         }
-        Box(
-            modifier = Modifier.wrapContentSize(),
-        ) {
+        Box {
             OnboardingActionBlock(
                 firstActionContent = {
                     PrimaryButtonIconLeft(
@@ -98,7 +95,7 @@ private fun CardImageBlock(
                 .build(),
             loading = { CardPlaceHolder(cardImageModifier) },
             error = { CardPlaceHolder(cardImageModifier) },
-            contentDescription = "Tangem Card",
+            contentDescription = null,
         )
     }
 }
@@ -108,7 +105,7 @@ private fun CardPlaceHolder(modifier: Modifier) {
     Image(
         modifier = modifier,
         painter = painterResource(id = R.drawable.card_placeholder_black),
-        contentDescription = "Tangem Card placeholder",
         contentScale = ContentScale.Fit,
+        contentDescription = null,
     )
 }
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/StateBuilder.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/StateBuilder.kt
index 2819421add..0a2f23c8b1 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/StateBuilder.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/StateBuilder.kt
@@ -10,6 +10,7 @@ import com.tangem.feature.onboarding.presentation.wallet2.model.OnboardingSeedPh
 import com.tangem.feature.onboarding.presentation.wallet2.model.TextFieldState
 import com.tangem.feature.onboarding.presentation.wallet2.model.UiActions
 import com.tangem.feature.onboarding.presentation.wallet2.model.YourSeedPhraseState
+import kotlinx.collections.immutable.ImmutableList
 
 /**
 [REDACTED_AUTHOR]
@@ -110,7 +111,7 @@ class StateBuilder(
 
     fun mnemonicGenerated(
         uiState: OnboardingSeedPhraseState,
-        mnemonicComponents: List<String>,
+        mnemonicComponents: ImmutableList<String>,
     ): OnboardingSeedPhraseState {
         return updateMnemonicComponents(uiState, mnemonicComponents)
             .copy(
@@ -128,7 +129,7 @@ class StateBuilder(
 
     fun updateMnemonicComponents(
         uiState: OnboardingSeedPhraseState,
-        phraseList: List<String>,
+        phraseList: ImmutableList<String>,
     ): OnboardingSeedPhraseState = uiState.copy(
         yourSeedPhraseState = uiState.yourSeedPhraseState.copy(
             mnemonicComponents = phraseList,