diff --git a/core/src/main/res/layout/content_account.xml b/core/src/main/res/layout/content_account.xml
index c0d78891..535f984a 100644
--- a/core/src/main/res/layout/content_account.xml
+++ b/core/src/main/res/layout/content_account.xml
@@ -95,31 +95,42 @@
 
                 <TextView
                     android:id="@+id/device_name_label"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="24dp"
+                    android:layout_marginEnd="8dp"
                     android:alpha="0.7"
                     android:text="@string/device_name_label"
                     android:textColor="@color/account_text"
                     android:visibility="@{account.deviceManagement ? View.VISIBLE : View.GONE}"
                     app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/qr"
                     app:layout_constraintTop_toBottomOf="@+id/active" />
                 
                 <TextView
                     android:id="@+id/device_name"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="2dp"
+                    android:layout_marginEnd="8dp"
                     android:letterSpacing="-0.02"
                     android:text="@{account.deviceName}"
                     android:textColor="@color/account_text"
                     android:visibility="@{account.deviceManagement ? View.VISIBLE : View.GONE}"
                     android:textSize="20sp"
                     app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/qr"
                     app:layout_constraintTop_toBottomOf="@+id/device_name_label" />
 
+                <androidx.constraintlayout.widget.Barrier
+                    android:id="@+id/copy_btn_barrier"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="bottom"
+                    app:constraint_referenced_ids="qr,device_name" />
+
                 <View
                     android:id="@+id/line"
                     android:layout_width="0dp"
@@ -251,7 +262,7 @@
                     app:layout_constraintBottom_toTopOf="@+id/account_type_label"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/qr"
+                    app:layout_constraintTop_toBottomOf="@+id/copy_btn_barrier"
                     app:layout_constraintVertical_bias="0.0" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout