diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsConfirmFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsConfirmFragment.kt
index 8e6dc116d8..07d0ea9b41 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsConfirmFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsConfirmFragment.kt
@@ -68,7 +68,7 @@ class DetailsConfirmFragment : Fragment(R.layout.fragment_details_confirm),
             }
             ConfirmScreenState.LongTap, ConfirmScreenState.AccessCode,
             ConfirmScreenState.PassCode -> {
-                toolbar.title = getString(R.string.details_row_title_manage_security)
+                toolbar.title = getString(R.string.details_manage_security_title)
                 tv_warning_description.text = getString(R.string.details_security_management_warning)
                 btn_confirm.text = getString(R.string.common_save_changes)
                 btn_confirm.setCompoundDrawablesRelativeWithIntrinsicBounds(
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
index acb76789ba..8651dbd9d3 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
@@ -125,7 +125,7 @@ class DetailsFragment : Fragment(R.layout.fragment_details), StoreSubscriber<Det
             store.dispatch(NavigationAction.NavigateTo(AppScreen.WalletConnectSessions))
         }
 
-        tv_security_title.setOnClickListener {
+        ll_manage_security.setOnClickListener {
             store.dispatch(DetailsAction.ManageSecurity.CheckCurrentSecurityOption(state.scanResponse!!.card))
         }
 
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index b6475a8ac3..58ac038846 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -133,32 +133,39 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_issuer"
                 tools:text="48 hashes" />
 
-            <TextView
-                android:id="@+id/tv_security"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawablePadding="15dp"
-                android:paddingTop="7dp"
-                android:paddingBottom="7dp"
-                android:textColor="@color/darkGray1"
-                android:textSize="16sp"
-                app:drawableEndCompat="@drawable/ic_angle_bracket_right"
-                app:drawableTint="@color/darkGray1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_signed_hashes_title"
-                tools:text="Long Tap" />
-
-            <TextView
-                android:id="@+id/tv_security_title"
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/ll_manage_security"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
                 android:paddingTop="7dp"
                 android:paddingBottom="7dp"
-                android:text="@string/details_row_title_manage_security"
-                android:textColor="@color/darkGray6"
-                android:textSize="16sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_signed_hashes" />
+                app:layout_constraintTop_toBottomOf="@+id/tv_signed_hashes_title">
+
+                <TextView
+                    android:id="@+id/tv_security_title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/details_row_title_manage_security"
+                    android:textColor="@color/darkGray6"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/tv_security"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:drawablePadding="15dp"
+                    android:gravity="end"
+                    android:maxLines="2"
+                    android:textColor="@color/darkGray1"
+                    android:textSize="16sp"
+                    app:drawableEndCompat="@drawable/ic_angle_bracket_right"
+                    app:drawableTint="@color/darkGray1"
+                    tools:text="Long Tap" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
             <TextView
                 android:id="@+id/tv_create_backup"
@@ -173,7 +180,7 @@
                 app:drawableEndCompat="@drawable/ic_angle_bracket_right"
                 app:drawableTint="@color/darkGray1"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_security_title" />
+                app:layout_constraintTop_toBottomOf="@id/ll_manage_security" />
 
             <TextView
                 android:id="@+id/tv_reset_to_factory"
diff --git a/app/src/main/res/layout/fragment_details_security.xml b/app/src/main/res/layout/fragment_details_security.xml
index 98f442ad29..25d17cf8cc 100644
--- a/app/src/main/res/layout/fragment_details_security.xml
+++ b/app/src/main/res/layout/fragment_details_security.xml
@@ -21,7 +21,8 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
-            app:title="@string/details_row_title_manage_security" />
+            app:title="@string/details_manage_security_title" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout