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 d37568eb5..bdf240fd6 100644
--- a/app/src/main/res/layout-v23/view_advanced_unlock.xml
+++ b/app/src/main/res/layout-v23/view_advanced_unlock.xml
@@ -24,18 +24,12 @@
     android:id="@+id/fingerprint_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-    <View
-        android:id="@+id/biometric_delimiter"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/colorPrimaryDark"
-        app:layout_constraintTop_toTopOf="parent"/>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/biometric_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        app:layout_constraintTop_toBottomOf="@+id/biometric_delimiter"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="12dp"
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index 56af700f8..0839a870c 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -23,6 +23,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/background_repeat"
+    android:backgroundTint="?android:attr/textColor"
     tools:targetApi="o">
 
     <com.kunzisoft.keepass.view.SpecialModeView
@@ -34,73 +36,59 @@
         app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
+        android:background="?attr/colorPrimary"
+        android:theme="?attr/toolbarAppearance"
+        android:popupTheme="?attr/toolbarPopupAppearance"
+        app:layout_collapseMode="pin"
+        tools:targetApi="lollipop">
+        <TextView
+            android:id="@+id/filename"
+            style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:ellipsize="marquee"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:scrollHorizontally="true"
+            android:singleLine="true"/>
+    </androidx.appcompat.widget.Toolbar>
+
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/activity_password_coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintBottom_toTopOf="@+id/activity_password_info_container">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
+        <FrameLayout
+            android:id="@+id/biometric_info_container"
+            android:background="?android:attr/colorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="true">
-
-            <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:id="@+id/toolbar_layout"
+            android:layout_gravity="bottom">
+            <com.kunzisoft.keepass.view.AdvancedUnlockInfoView
+                android:id="@+id/biometric_info"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:titleEnabled="false"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="?attr/actionBarSize">
-                    <com.kunzisoft.keepass.view.AdvancedUnlockInfoView
-                        android:id="@+id/biometric_info"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"/>
-                </LinearLayout>
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    android:background="?attr/colorPrimary"
-                    android:theme="?attr/toolbarAppearance"
-                    android:popupTheme="?attr/toolbarPopupAppearance"
-                    app:layout_collapseMode="pin"
-                    tools:targetApi="lollipop">
-                    <TextView
-                        android:id="@+id/filename"
-                        style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:ellipsize="marquee"
-                        android:marqueeRepeatLimit="marquee_forever"
-                        android:scrollHorizontally="true"
-                        android:singleLine="true"/>
-                </androidx.appcompat.widget.Toolbar>
-
-            </com.google.android.material.appbar.CollapsingToolbarLayout>
-        </com.google.android.material.appbar.AppBarLayout>
+                android:layout_height="wrap_content"
+                android:visibility="gone"/>
+        </FrameLayout>
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/scroll_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbarStyle="insideOverlay"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            android:layout_height="wrap_content"
+            android:scrollbarStyle="insideOverlay">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content"
+                android:background="?android:attr/windowBackground">
                 <LinearLayout
                     android:id="@+id/unlock_container"
                     android:orientation="vertical"