diff --git a/app/src/main/res/layout/layout_backup_access_code.xml b/app/src/main/res/layout/layout_backup_access_code.xml
index de45562ba3..d8c721b7f6 100644
--- a/app/src/main/res/layout/layout_backup_access_code.xml
+++ b/app/src/main/res/layout/layout_backup_access_code.xml
@@ -8,36 +8,36 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/access_code_title"
-        style="@style/heading"
-        android:textStyle="bold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="100dp"
-        android:text="@string/onboarding_access_code_intro_title"
-        android:textAlignment="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/access_code_title"
+            style="@style/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/access_code_title_margin_top"
+            android:text="@string/onboarding_access_code_intro_title"
+            android:textAlignment="center"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <include
-        android:id="@+id/layout_backup_access_code_info"
-        layout="@layout/layout_backup_access_code_info"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/access_code_title" />
+        <include
+            android:id="@+id/layout_backup_access_code_info"
+            layout="@layout/layout_backup_access_code_info"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/access_code_title" />
 
-    <include
-        android:id="@+id/layout_backup_access_code_submit"
-        layout="@layout/layout_backup_access_code_submit"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/access_code_title" />
+        <include
+            android:id="@+id/layout_backup_access_code_submit"
+            layout="@layout/layout_backup_access_code_submit"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/access_code_title" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/layout_backup_access_code_info.xml b/app/src/main/res/layout/layout_backup_access_code_info.xml
index ac5a98171f..3ef7ba57fb 100644
--- a/app/src/main/res/layout/layout_backup_access_code_info.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_info.xml
@@ -8,18 +8,18 @@
         android:id="@+id/iv_access_code_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="@dimen/access_code_info_protect_margin_top"
         android:src="@drawable/ic_access_code"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:layout_marginTop="20dp"
         android:id="@+id/tv_feature_1_title"
         style="@style/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/access_code_info_protect_margin_top"
         android:text="@string/onboarding_access_code_feature_1_title"
         android:textAlignment="center"
         app:layout_constraintStart_toStartOf="@id/tv_feature_1_description"
@@ -52,7 +52,7 @@
         style="@style/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="@dimen/access_code_info_items_space"
         android:text="@string/onboarding_access_code_feature_2_title"
         android:textAlignment="center"
         app:layout_constraintStart_toStartOf="@id/tv_feature_1_description"
@@ -85,7 +85,7 @@
         style="@style/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="@dimen/access_code_info_items_space"
         android:text="@string/onboarding_access_code_feature_3_title"
         android:textAlignment="center"
         app:layout_constraintStart_toStartOf="@id/tv_feature_3_description"
@@ -119,9 +119,9 @@
         style="@style/TapButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="78dp"
-        android:layout_marginEnd="78dp"
-        android:layout_marginBottom="92dp"
+        android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
+        android:layout_marginEnd="@dimen/access_code_btn_continue_margin_start"
+        android:layout_marginBottom="@dimen/access_code_btn_continue_margin_bottom"
         android:text="@string/common_continue"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/layout_backup_access_code_submit.xml b/app/src/main/res/layout/layout_backup_access_code_submit.xml
index c9416e28f1..7505dbcc4d 100644
--- a/app/src/main/res/layout/layout_backup_access_code_submit.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_submit.xml
@@ -14,8 +14,8 @@
         android:layout_marginTop="14dp"
         android:paddingStart="32dp"
         android:paddingEnd="32dp"
-        android:textAlignment="center"
         android:text="@string/onboarding_access_code_hint"
+        android:textAlignment="center"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textfield.TextInputLayout
@@ -28,12 +28,12 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="40dp"
         android:hint="@string/onboarding_wallet_info_title_third"
+        android:theme="@style/EditTextThemeOverlay"
         app:boxStrokeColor="@color/selector_edit_text"
         app:boxStrokeWidth="1dp"
         app:endIconDrawable="@drawable/selector_password_toggle"
         app:endIconMode="password_toggle"
         app:hintTextColor="@color/accent"
-        android:theme="@style/EditTextThemeOverlay"
         app:layout_constraintTop_toBottomOf="@id/tv_access_code_enter_description">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -48,16 +48,15 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_access_code_submit"
         style="@style/TapButton"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="78dp"
-        android:layout_marginEnd="78dp"
-        android:layout_marginBottom="92dp"
-        android:layout_marginTop="32dp"
-        app:layout_constraintTop_toTopOf="@id/til_access_code"
-        app:layout_constraintVertical_bias="1"
+        android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
+        android:layout_marginEnd="@dimen/access_code_btn_continue_margin_end"
+        android:layout_marginBottom="@dimen/access_code_btn_continue_margin_bottom"
         android:text="@string/common_create"
         android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-h680dp/dimens.xml b/app/src/main/res/values-h680dp/dimens.xml
index 9e11e3d73e..7a03c1b4cf 100644
--- a/app/src/main/res/values-h680dp/dimens.xml
+++ b/app/src/main/res/values-h680dp/dimens.xml
@@ -28,4 +28,11 @@
     <dimen name="onboarding_square_background_margin_top">67dp</dimen>
     <item name="onboarding_wallet_top_guide_line_weight" type="dimen" format="float">0.56</item>
 
+    <!--  Onboarding - Wallet - Access code  -->
+    <dimen name="access_code_title_margin_top">80dp</dimen>
+    <dimen name="access_code_imv_lock_margin_top">24dp</dimen>
+    <dimen name="access_code_info_protect_margin_top">20dp</dimen>
+    <dimen name="access_code_info_items_space">32dp</dimen>
+    <dimen name="access_code_btn_continue_margin_bottom">80dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9d09f6bcbb..ce2c35b5fb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -63,4 +63,13 @@
     <dimen name="onboarding_square_background_margin_top">37dp</dimen>
     <item name="onboarding_wallet_top_guide_line_weight" type="dimen" format="float">0.48</item>>
 
+    <!--  Onboarding - Wallet - Access code  -->
+    <dimen name="access_code_title_margin_top">40dp</dimen>
+    <dimen name="access_code_imv_lock_margin_top">12dp</dimen>
+    <dimen name="access_code_info_protect_margin_top">8dp</dimen>
+    <dimen name="access_code_info_items_space">16dp</dimen>
+    <dimen name="access_code_btn_continue_margin_bottom">38dp</dimen>
+    <dimen name="access_code_btn_continue_margin_start">78dp</dimen>
+    <dimen name="access_code_btn_continue_margin_end">78dp</dimen>
+
 </resources>