diff --git a/app/src/main/res/layout/fragment_saved_login_site_info.xml b/app/src/main/res/layout/fragment_saved_login_site_info.xml
index 9e52d73042..c89c080cb4 100644
--- a/app/src/main/res/layout/fragment_saved_login_site_info.xml
+++ b/app/src/main/res/layout/fragment_saved_login_site_info.xml
@@ -7,7 +7,8 @@
     android:id="@+id/siteLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="66dp">
+    android:layout_marginStart="66dp"
+    android:layout_marginTop="12dp">
 
     <TextView
         android:id="@+id/siteHeaderText"
@@ -27,7 +28,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="@id/copySiteItem"
         app:layout_constraintEnd_toEndOf="@id/siteHeaderText"
         app:layout_constraintStart_toStartOf="@id/siteHeaderText"
         app:layout_constraintTop_toBottomOf="@id/siteHeaderText"
@@ -40,21 +40,23 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/saved_login_copy_site"
+        app:layout_constraintBottom_toBottomOf="@id/siteInfoText"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/siteHeaderText"
         app:srcCompat="@drawable/ic_copy" />
 
     <TextView
         android:id="@+id/usernameHeaderText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
         android:text="@string/preferences_passwords_saved_logins_username"
         android:textColor="?primaryText"
         android:textSize="12sp"
         app:layout_constraintBottom_toTopOf="@id/usernameInfoText"
         app:layout_constraintEnd_toStartOf="@id/copyUsernameItem"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/copySiteItem"
+        app:layout_constraintTop_toBottomOf="@id/siteInfoText"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -62,7 +64,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="@id/copyUsernameItem"
         app:layout_constraintEnd_toEndOf="@id/usernameHeaderText"
         app:layout_constraintStart_toStartOf="@id/usernameHeaderText"
         app:layout_constraintTop_toBottomOf="@id/usernameHeaderText"
@@ -75,21 +76,23 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/saved_login_copy_username"
+        app:layout_constraintBottom_toBottomOf="@id/usernameInfoText"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/copySiteItem"
+        app:layout_constraintTop_toTopOf="@id/usernameHeaderText"
         app:srcCompat="@drawable/ic_copy" />
 
     <TextView
         android:id="@+id/passwordHeaderText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
         android:text="@string/preferences_passwords_saved_logins_password"
         android:textColor="?primaryText"
         android:textSize="12sp"
         app:layout_constraintBottom_toTopOf="@id/passwordInfoText"
         app:layout_constraintEnd_toStartOf="@id/revealPasswordItem"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/copyUsernameItem"
+        app:layout_constraintTop_toBottomOf="@id/usernameInfoText"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -111,11 +114,11 @@
         android:layout_height="48dp"
         android:layout_marginEnd="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:tint="?android:colorAccent"
         android:contentDescription="@string/saved_login_reveal_password"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:tint="?android:colorAccent"
+        app:layout_constraintBottom_toBottomOf="@id/passwordInfoText"
         app:layout_constraintEnd_toStartOf="@id/copyPasswordItem"
-        app:layout_constraintTop_toBottomOf="@id/copyUsernameItem"
+        app:layout_constraintTop_toTopOf="@id/passwordHeaderText"
         app:srcCompat="@drawable/mozac_ic_password_reveal" />
 
     <ImageButton