diff --git a/app/src/androidTest/java/com/tangem/wallet/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/tangem/wallet/ExampleInstrumentedTest.kt
deleted file mode 100644
index 9a7a795e39..0000000000
--- a/app/src/androidTest/java/com/tangem/wallet/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.tangem.wallet
-
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("com.tangem.wallet", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
index 58d20cf256..eda5e31bcc 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
@@ -1,16 +1,13 @@
 package com.tangem.tap.features.details.ui.resetcard
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -22,7 +19,6 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.layout
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -40,18 +36,11 @@ fun ResetCardScreen(
     onBackPressed: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    Box(modifier = modifier.background(colorResource(id = R.color.background_primary))) {
-        Image(
-            painter = painterResource(id = R.drawable.ic_reset_background),
-            contentDescription = "",
-            modifier = modifier.offset(y = (-16).dp),
-        )
         SettingsScreensScaffold(
             content = { ResetCardView(state = state, modifier = modifier) },
             onBackClick = onBackPressed,
             backgroundColor = Color.Transparent,
         )
-    }
 }
 
 @Composable
@@ -61,33 +50,26 @@ fun ResetCardView(
 ) {
     Column(
         modifier = modifier
-            .fillMaxSize(),
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.SpaceBetween,
     ) {
         Box(
-            modifier = modifier
-                .padding(bottom = 20.dp),
+            modifier = modifier,
         ) {
+            Image(
+                painter = painterResource(id = R.drawable.ic_reset_background),
+                contentDescription = "",
+                modifier = modifier.offset(y = (-82).dp),
+            )
             ScreenTitle(titleRes = R.string.reset_card_to_factory_navigation_title)
         }
-
+        Spacer(
+            modifier = modifier.weight(1f),
+        )
         Column(
             modifier = modifier
-                .layout { measurable, constraints ->
-                    val placeable =
-                        measurable.measure(
-                            constraints.copy(
-                                // left 200.dp for min image height
-                                maxHeight = constraints.maxHeight - 215.dp.roundToPx(),
-                                // occupy all height except full image square in case of smaller text
-                                minHeight = constraints.maxHeight - constraints.maxWidth,
-                            ),
-                        )
-                    layout(placeable.width, placeable.height) {
-                        placeable.place(0, 0)
-                    }
-                }
-                .height(IntrinsicSize.Min),
+                .offset(y = (-32).dp),
             verticalArrangement = Arrangement.Bottom,
         ) {
             Text(
@@ -102,9 +84,7 @@ fun ResetCardView(
             Text(
                 text = stringResource(id = R.string.reset_card_to_factory_message),
                 modifier = modifier
-                    .padding(start = 20.dp, end = 20.dp)
-                    .weight(1f, false)
-                    .verticalScroll(rememberScrollState()),
+                    .padding(start = 20.dp, end = 20.dp),
                 style = TangemTypography.body1,
                 color = colorResource(id = R.color.text_secondary),
             )
@@ -146,7 +126,7 @@ fun ResetCardView(
             Spacer(modifier = modifier.size(32.dp))
             Box(
                 modifier = modifier
-                    .padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
+                    .padding(start = 16.dp, end = 16.dp),
             ) {
                 DetailsMainButton(
                     title = stringResource(id = R.string.reset_card_to_factory_button_title),