diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 96d850bda..177f34071 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -54,7 +54,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     tools:text="Database"
-                    style="@style/KeepassDXStyle.Title.OnSurface" />
+                    style="@style/KeepassDXStyle.TextAppearance.LargeTitle" />
             </FrameLayout>
         </com.google.android.material.appbar.MaterialToolbar>
 
diff --git a/app/src/main/res/layout/fragment_file_selection_information.xml b/app/src/main/res/layout/fragment_file_selection_information.xml
deleted file mode 100644
index 9c91a391f..000000000
--- a/app/src/main/res/layout/fragment_file_selection_information.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2019 Jeremy Jamet / Kunzisoft.
-
- This file is part of KeePassDX.
-
-  KeePassDX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KeePassDX is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/default_margin">
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/file_filename"
-        android:layout_margin="8dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/KeepassDXStyle.TextAppearance.LargeTitle"/>
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/file_path"
-        android:textIsSelectable="true"
-        android:layout_margin="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:textStyle="italic"/>
-
-    <LinearLayout
-        android:id="@+id/file_modification_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="end">
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/file_modification_label"
-            android:layout_margin="8dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/entry_modified"/>
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/file_modification"
-            android:layout_margin="8dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="end" />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/file_size_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp">
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/file_size"
-            android:layout_marginLeft="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@+id/file_size_unit"
-            android:layout_toStartOf="@+id/file_size_unit"
-            android:gravity="end" />
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/file_size_unit"
-            android:layout_marginLeft="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="21 MB"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_header_database.xml b/app/src/main/res/layout/nav_header_database.xml
index 2bff74f3d..ebcd72ba4 100644
--- a/app/src/main/res/layout/nav_header_database.xml
+++ b/app/src/main/res/layout/nav_header_database.xml
@@ -69,7 +69,7 @@
 
     <TextView
         android:id="@+id/nav_database_name"
-        style="@style/KeepassDXStyle.Title.OnSurface"
+        style="@style/KeepassDXStyle.TextAppearance.LargeTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="6dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8dad299c0..08bdeffd8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,7 +262,7 @@
     <string name="menu_security_settings">Security settings</string>
     <string name="menu_security_settings_summary">Encryption, key derivation function</string>
     <string name="menu_master_key_settings">Master key settings</string>
-    <string name="master_key_settings_summary">Change main credential, renewal</string>
+    <string name="master_key_settings_summary">Change, renewal</string>
     <string name="menu_donate">Donate</string>
     <string name="menu_edit">Edit</string>
     <string name="menu_copy">Copy</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b69c84c81..e7560906f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -443,7 +443,6 @@
         <item name="android:textSize">14sp</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.LargeTitle" parent="KeepassDXStyle.TextAppearance">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">20sp</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Tiny" parent="KeepassDXStyle.TextAppearance">