diff --git a/app/src/main/res/layout-v23/view_advanced_unlock.xml b/app/src/main/res/layout-v23/view_advanced_unlock.xml
index 4461bb2d8..d37568eb5 100644
--- a/app/src/main/res/layout-v23/view_advanced_unlock.xml
+++ b/app/src/main/res/layout-v23/view_advanced_unlock.xml
@@ -31,36 +31,37 @@
         android:background="?attr/colorPrimaryDark"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <TextView
-        android:id="@+id/biometric_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginTop="8dp"
-        android:orientation="vertical"
-        app:layout_constraintTop_toBottomOf="@+id/biometric_delimiter"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="@string/biometric_prompt_store_credential_title"
-        style="@style/KeepassDXStyle.TextAppearance.Default.TextOnPrimary"
-        android:textSize="14sp"
-        android:gravity="center" />
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/biometric_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_margin="12dp"
-        app:layout_constraintTop_toBottomOf="@+id/biometric_title"
+        app:layout_constraintTop_toBottomOf="@+id/biometric_delimiter"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/biometric_message"
+        android:layout_marginTop="12dp"
         android:elevation="8dp"
         android:src="@drawable/fingerprint"
         android:background="@drawable/background_image"
         android:backgroundTint="?attr/colorAccent" />
 
+    <TextView
+        android:id="@+id/biometric_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@+id/biometric_image"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/biometric_message"
+        tools:text="@string/biometric_prompt_store_credential_title"
+        style="@style/KeepassDXStyle.TextAppearance.Default.TextOnPrimary"
+        android:textSize="14sp"
+        android:gravity="center" />
+
     <TextView
         android:id="@+id/biometric_message"
         android:layout_width="match_parent"
@@ -69,6 +70,7 @@
         android:layout_marginEnd="12dp"
         android:orientation="vertical"
         android:layout_marginBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/biometric_title"
         app:layout_constraintBottom_toBottomOf="parent"
         tools:text="Sample error"
         style="@style/KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary"
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index 9527e5855..17160706d 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -61,19 +61,15 @@
                     android:layout_marginTop="?attr/actionBarSize">
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/default_database"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:minHeight="48dp"
-                        android:layout_gravity="end"
-                        android:gravity="center_vertical|end"
-                        android:textColor="?android:attr/textColorHintInverse"
-                        android:textSize="12sp"
+                        android:layout_gravity="center"
+                        android:gravity="center_vertical"
+                        android:minHeight="42dp"
                         android:paddingHorizontal="8dp"
-                        android:layout_marginLeft="24dp"
-                        android:layout_marginStart="24dp"
-                        android:layout_marginRight="12dp"
-                        android:layout_marginEnd="12dp"
-                        android:text="@string/default_checkbox"/>
+                        android:text="@string/default_checkbox"
+                        android:textColor="?android:attr/textColorHintInverse"
+                        android:textSize="12sp" />
                     <com.kunzisoft.keepass.view.AdvancedUnlockInfoView
                         android:id="@+id/biometric_info"
                         android:layout_width="match_parent"