diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
index df2177a9d..6cf47f501 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -112,7 +112,7 @@ class EntryActivity : DatabaseLockActivity() {
     }
 
     private var mIcon: IconImage? = null
-    private var mColorAccent: Int = 0
+    private var mColorSecondary: Int = 0
     private var mControlColor: Int = 0
     private var mColorPrimary: Int = 0
     private var mColorBackground: Int = 0
@@ -146,15 +146,15 @@ class EntryActivity : DatabaseLockActivity() {
         toolbar?.title = " "
 
         // Retrieve the textColor to tint the toolbar
-        val taColorAccent = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+        val taColorSecondary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
         val taControlColor = theme.obtainStyledAttributes(intArrayOf(R.attr.toolbarColorControl))
         val taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary))
         val taColorBackground = theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
-        mColorAccent = taColorAccent.getColor(0, Color.BLACK)
+        mColorSecondary = taColorSecondary.getColor(0, Color.BLACK)
         mControlColor = taControlColor.getColor(0, Color.BLACK)
         mColorPrimary = taColorPrimary.getColor(0, Color.BLACK)
         mColorBackground = taColorBackground.getColor(0, Color.BLACK)
-        taColorAccent.recycle()
+        taColorSecondary.recycle()
         taControlColor.recycle()
         taColorPrimary.recycle()
         taColorBackground.recycle()
@@ -227,7 +227,7 @@ class EntryActivity : DatabaseLockActivity() {
                 historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE
                 if (entryIsHistory) {
                     collapsingToolbarLayout?.contentScrim =
-                        ColorDrawable(mColorAccent)
+                        ColorDrawable(mColorSecondary)
                 }
 
                 val entryInfo = entryInfoHistory.entryInfo
@@ -380,7 +380,7 @@ class EntryActivity : DatabaseLockActivity() {
                 mDatabase?.iconDrawableFactory?.assignDatabaseIcon(
                     iconView,
                     icon,
-                    mForegroundColor ?: mColorAccent
+                    mForegroundColor ?: mColorSecondary
                 )
             }
         }
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
index 2403eebbf..885159b0d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
@@ -108,7 +108,7 @@ class GroupDialogFragment : DatabaseDialogFragment() {
             uuidReferenceView = root.findViewById(R.id.group_UUID_reference)
 
             // Retrieve the textColor to tint the icon
-            val ta = activity.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+            val ta = activity.theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
             mIconColor = ta.getColor(0, Color.WHITE)
             ta.recycle()
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
index f87576716..e9fa81caf 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
@@ -40,7 +40,7 @@ class BreadcrumbAdapter(val context: Context)
         mShowUUID = PreferencesUtil.showUUID(context)
 
         // Retrieve the textColor to tint the icon
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
+        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnPrimary))
         mIconColor = taTextColor.getColor(0, Color.WHITE)
         taTextColor.recycle()
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
index 0d16635a7..2e97a3893 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
@@ -92,7 +92,7 @@ class FileDatabaseHistoryAdapter(context: Context)
     init {
         val typedValue = TypedValue()
         val theme = context.theme
-        theme.resolveAttribute(R.attr.colorAccent, typedValue, true)
+        theme.resolveAttribute(R.attr.colorSecondary, typedValue, true)
         warningColor = typedValue.data
         theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true)
         defaultColor = typedValue.data
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
index 61a1eaaab..840496b44 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -95,9 +95,9 @@ class NodesAdapter (
     @ColorInt
     private val mTextColorSecondary: Int
     @ColorInt
-    private val mColorAccentLight: Int
+    private val mColorSecondary: Int
     @ColorInt
-    private val mColorOnAccentColor: Int
+    private val mColorOnSecondary: Int
 
     /**
      * Determine if the adapter contains or not any element
@@ -127,13 +127,13 @@ class NodesAdapter (
         this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK)
         taTextColorSecondary.recycle()
         // To get background color for selection
-        val taColorAccentLight = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight))
-        this.mColorAccentLight = taColorAccentLight.getColor(0, Color.GRAY)
-        taColorAccentLight.recycle()
+        val taColorSecondary = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
+        this.mColorSecondary = taColorSecondary.getColor(0, Color.GRAY)
+        taColorSecondary.recycle()
         // To get text color for selection
-        val taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor))
-        this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE)
-        taColorOnAccentColor.recycle()
+        val taColorOnSecondary = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSecondary))
+        this.mColorOnSecondary = taColorOnSecondary.getColor(0, Color.WHITE)
+        taColorOnSecondary.recycle()
     }
 
     private fun assignPreferences() {
@@ -380,7 +380,7 @@ class NodesAdapter (
 
         // Assign icon colors
         var iconColor = if (holder.container.isSelected)
-            mColorOnAccentColor
+            mColorOnSecondary
         else when (subNode.type) {
             Type.GROUP -> mTextColorPrimary
             Type.ENTRY -> mTextColor
@@ -436,7 +436,7 @@ class NodesAdapter (
                     holder.container.setBackgroundColor(Color.TRANSPARENT)
                 }
             } else {
-                holder.container.setBackgroundColor(mColorAccentLight)
+                holder.container.setBackgroundColor(mColorSecondary)
             }
             val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
             if (!holder.container.isSelected) {
@@ -457,12 +457,12 @@ class NodesAdapter (
                     holder.meta.setTextColor(mTextColor)
                 }
             } else {
-                holder.text.setTextColor(mColorOnAccentColor)
-                holder.subText?.setTextColor(mColorOnAccentColor)
-                holder.otpToken?.setTextColor(mColorOnAccentColor)
-                holder.otpProgress?.setIndicatorColor(mColorOnAccentColor)
-                holder.attachmentIcon?.setColorFilter(mColorOnAccentColor)
-                holder.meta.setTextColor(mColorOnAccentColor)
+                holder.text.setTextColor(mColorOnSecondary)
+                holder.subText?.setTextColor(mColorOnSecondary)
+                holder.otpToken?.setTextColor(mColorOnSecondary)
+                holder.otpProgress?.setIndicatorColor(mColorOnSecondary)
+                holder.attachmentIcon?.setColorFilter(mColorOnSecondary)
+                holder.meta.setTextColor(mColorOnSecondary)
             }
 
             database.stopManageEntry(entry)
diff --git a/app/src/main/res/animator-v23/scan.xml b/app/src/main/res/animator-v23/scan.xml
deleted file mode 100644
index d4965f389..000000000
--- a/app/src/main/res/animator-v23/scan.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2015 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:ordering="sequentially">
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/clip_path_scan_top"
-        android:valueTo="@string/clip_path_scan_bottom"
-        android:valueType="pathType"
-        android:duration="800"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/clip_path_scan_bottom"
-        android:valueTo="@string/clip_path_scan_top"
-        android:valueType="pathType"
-        android:startOffset="50"
-        android:duration="500"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
-
-</set>
diff --git a/app/src/main/res/color-v23/progress_color.xml b/app/src/main/res/color-v23/progress_color.xml
index cc68be3d4..4106a655a 100644
--- a/app/src/main/res/color-v23/progress_color.xml
+++ b/app/src/main/res/color-v23/progress_color.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccent" />
+    <item android:color="?attr/colorSecondary" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/background_button_color_secondary.xml b/app/src/main/res/color/background_button_color_secondary.xml
deleted file mode 100644
index 9af1c0e0d..000000000
--- a/app/src/main/res/color/background_button_color_secondary.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccentLight" android:state_pressed="true" />
-    <item android:color="@color/white_grey" android:state_activated="true" />
-    <item android:color="@color/white_grey_darker" android:state_enabled="false" />
-    <item android:color="?attr/colorAccent" android:state_enabled="true" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/background_button_color_primary.xml b/app/src/main/res/color/color_button_primary.xml
similarity index 76%
rename from app/src/main/res/color/background_button_color_primary.xml
rename to app/src/main/res/color/color_button_primary.xml
index 31a28d56a..404c70c74 100644
--- a/app/src/main/res/color/background_button_color_primary.xml
+++ b/app/src/main/res/color/color_button_primary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?attr/colorPrimaryDark" android:state_pressed="true" />
-    <item android:color="@color/white_grey_darker" android:state_enabled="false" />
+    <item android:color="?attr/colorTertiary" android:state_enabled="false" />
     <item android:color="?attr/colorPrimary" android:state_enabled="true" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_button_secondary.xml b/app/src/main/res/color/color_button_secondary.xml
new file mode 100644
index 000000000..a7d084f41
--- /dev/null
+++ b/app/src/main/res/color/color_button_secondary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorTertiary" android:state_enabled="false" />
+    <item android:color="?attr/colorSecondary" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_on_button_primary.xml b/app/src/main/res/color/color_on_button_primary.xml
new file mode 100644
index 000000000..f4e93d5d5
--- /dev/null
+++ b/app/src/main/res/color/color_on_button_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="?attr/colorOnTertiary"/>
+    <item android:color="?attr/colorOnPrimary"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/edit_text_stroke_color.xml b/app/src/main/res/color/edit_text_stroke_color.xml
index 1e73b070e..10e2723ac 100644
--- a/app/src/main/res/color/edit_text_stroke_color.xml
+++ b/app/src/main/res/color/edit_text_stroke_color.xml
@@ -18,7 +18,7 @@
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccent" android:state_focused="true"/>
+    <item android:color="?attr/colorSecondary" android:state_focused="true"/>
     <item android:alpha="0.46" android:color="?attr/colorOnSurface" android:state_hovered="true"/>
     <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
     <item android:alpha="0.42" android:color="?attr/colorOnSurface"/>
diff --git a/app/src/main/res/color/list_primary_color.xml b/app/src/main/res/color/list_primary_color.xml
index 06694e43a..5f4d3121e 100644
--- a/app/src/main/res/color/list_primary_color.xml
+++ b/app/src/main/res/color/list_primary_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="true" android:color="?attr/colorOnAccentColor"/>
+    <item android:state_selected="true" android:color="?attr/colorOnSecondary"/>
     <item android:color="?android:attr/textColorPrimary"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_button.xml b/app/src/main/res/color/text_color_button.xml
index 13c44bba4..41fb69212 100644
--- a/app/src/main/res/color/text_color_button.xml
+++ b/app/src/main/res/color/text_color_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/white_grey" android:state_enabled="false" />
-    <item android:color="?attr/colorOnAccentColor" android:state_enabled="true" />
+    <item android:color="?attr/colorOnSecondary" android:state_enabled="true" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/background_button_small.xml b/app/src/main/res/drawable-v21/background_button_small.xml
index db088c7a2..c203f0917 100644
--- a/app/src/main/res/drawable-v21/background_button_small.xml
+++ b/app/src/main/res/drawable-v21/background_button_small.xml
@@ -14,7 +14,7 @@
                         android:right="14dp"
                         android:top="4dp"
                         android:bottom="8dp"/>
-                    <solid android:color="?attr/colorAccent"/>
+                    <solid android:color="?attr/colorSecondary"/>
                 </shape>
             </item>
         </layer-list>
diff --git a/app/src/main/res/drawable-v21/background_icon.xml b/app/src/main/res/drawable-v21/background_icon.xml
index 4bf4cf1ca..eeed6744d 100644
--- a/app/src/main/res/drawable-v21/background_icon.xml
+++ b/app/src/main/res/drawable-v21/background_icon.xml
@@ -11,7 +11,7 @@
                 android:right="12dp"
                 android:top="12dp"
                 android:bottom="12dp"/>
-            <solid android:color="?attr/colorAccent"/>
+            <solid android:color="?attr/colorSecondary"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/background_image_button.xml b/app/src/main/res/drawable-v21/background_image_button.xml
index ae42055a0..416ee142b 100644
--- a/app/src/main/res/drawable-v21/background_image_button.xml
+++ b/app/src/main/res/drawable-v21/background_image_button.xml
@@ -6,7 +6,7 @@
     <item>
         <shape
             android:shape="oval">
-            <stroke android:color="?attr/colorAccent" android:width="1dp"/>
+            <stroke android:color="?attr/colorSecondary" android:width="1dp"/>
             <padding
                 android:left="12dp"
                 android:right="12dp"
diff --git a/app/src/main/res/drawable-v21/background_item_selection.xml b/app/src/main/res/drawable-v21/background_item_selection.xml
index 4f4b3a3fc..e4690915a 100644
--- a/app/src/main/res/drawable-v21/background_item_selection.xml
+++ b/app/src/main/res/drawable-v21/background_item_selection.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape>
-            <solid android:color="?attr/colorAccentLight"/>
+            <solid android:color="?attr/colorSecondary"/>
         </shape>
     </item>
     <item android:state_selected="false">
diff --git a/app/src/main/res/drawable-v23/bolt.xml b/app/src/main/res/drawable-v23/bolt.xml
deleted file mode 100644
index 8684f8cf3..000000000
--- a/app/src/main/res/drawable-v23/bolt.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/advanced_unlock_size"
-    android:height="@dimen/advanced_unlock_size"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group>
-        <path
-            android:fillColor="#fffbfb"
-            android:strokeWidth="1"
-            android:pathData="M 13 4 L 8 13 L 11.777344 13 L 11 20 L 16 11 L 12.222656 11 L 13 4 z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index f7e355eeb..dcd8a7989 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -82,7 +82,7 @@
                     android:id="@+id/entry_progress"
                     android:visibility="gone"
                     android:indeterminate="false"
-                    app:indicatorColor="?attr/colorAccent"
+                    app:indicatorColor="?attr/colorSecondary"
                     android:progress="10"
                     android:max="30"
                     android:layout_gravity="bottom"
@@ -109,9 +109,9 @@
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toTopOf="parent"
                     android:visibility="gone"
-                    android:background="?attr/colorAccent"
+                    android:background="?attr/colorSecondary"
                     android:padding="12dp"
-                    android:textColor="?attr/colorOnAccentColor"
+                    android:textColor="?attr/colorOnSecondary"
                     android:text="@string/entry_history"/>
 
                 <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml
index b503f0133..1e2db5575 100644
--- a/app/src/main/res/layout/activity_entry_edit.xml
+++ b/app/src/main/res/layout/activity_entry_edit.xml
@@ -93,7 +93,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/validate"
         android:src="@drawable/ic_check_white_24dp"
-        app:tint="?attr/colorOnAccentColor"
+        app:tint="?attr/colorOnSecondary"
         app:fabSize="mini"
         app:fabCustomSize="@dimen/button_small_size"
         app:layout_constraintTop_toTopOf="@+id/entry_edit_bottom_bar"
diff --git a/app/src/main/res/layout/activity_file_selection.xml b/app/src/main/res/layout/activity_file_selection.xml
index 62d666e1e..1cd4bc087 100644
--- a/app/src/main/res/layout/activity_file_selection.xml
+++ b/app/src/main/res/layout/activity_file_selection.xml
@@ -75,7 +75,7 @@
                         android:shadowDy="2"
                         android:shadowRadius="4"
                         android:paddingTop="?attr/actionBarSize"
-                        android:textColor="?attr/textColorInverse"
+                        android:textColor="?attr/colorOnPrimary"
                         android:gravity="center"
                         android:text="@string/app_name_part1"/>
                     <TextView
@@ -91,7 +91,7 @@
                         android:shadowDy="2"
                         android:shadowRadius="4"
                         android:paddingTop="?attr/actionBarSize"
-                        android:textColor="?attr/colorAccent"
+                        android:textColor="?attr/colorSecondary"
                         android:gravity="center"
                         android:text="@string/app_name_part2"/>
                     <TextView
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 7c3c34482..a50de1cda 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -87,7 +87,7 @@
                 android:layout_gravity="center_vertical|start"
                 android:visibility="gone"
                 android:src="@drawable/ic_modified_white_12dp"
-                app:tint="?attr/textColorInverse"
+                app:tint="?attr/colorOnSecondary"
                 android:contentDescription="@string/save"/>
         </FrameLayout>
 
@@ -191,7 +191,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:itemTextColor="?android:attr/textColor"
-        app:subheaderColor="?attr/colorAccent"
+        app:subheaderColor="?attr/colorSecondary"
         android:fitsSystemWindows="true" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_icon_picker.xml b/app/src/main/res/layout/activity_icon_picker.xml
index 0cdc49ef8..ae77f2592 100644
--- a/app/src/main/res/layout/activity_icon_picker.xml
+++ b/app/src/main/res/layout/activity_icon_picker.xml
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/validate"
         android:src="@drawable/ic_file_upload_white_24dp"
-        app:tint="?attr/colorOnAccentColor"
+        app:tint="?attr/colorOnSecondary"
         app:fabSize="mini"
         app:fabCustomSize="@dimen/button_small_size"
         app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"
diff --git a/app/src/main/res/layout/activity_key_generator.xml b/app/src/main/res/layout/activity_key_generator.xml
index 9cd8cff9d..5ec89a120 100644
--- a/app/src/main/res/layout/activity_key_generator.xml
+++ b/app/src/main/res/layout/activity_key_generator.xml
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/validate"
         android:src="@drawable/ic_check_white_24dp"
-        app:tint="?attr/colorOnAccentColor"
+        app:tint="?attr/colorOnSecondary"
         app:fabSize="mini"
         app:fabCustomSize="@dimen/button_small_size"
         app:layout_constraintTop_toTopOf="@+id/toolbar"
diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml
index a072e9d9f..ca799e47e 100644
--- a/app/src/main/res/layout/activity_main_credential.xml
+++ b/app/src/main/res/layout/activity_main_credential.xml
@@ -161,15 +161,10 @@
                 android:paddingRight="24dp"
                 style="@style/KeepassDXStyle.TextAppearance.Tiny"
                 android:text="@string/warning_database_link_revoked"
-                android:textColor="?attr/textColorInverse"
-                android:background="?attr/colorAccent"
+                android:textColor="?attr/colorOnSecondary"
+                android:background="?attr/colorSecondary"
                 app:layout_constraintBottom_toTopOf="@+id/activity_password_info_delimiter"
                 android:layout_gravity="bottom"/>
-            <View
-                android:id="@+id/activity_password_info_delimiter"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/colorAccentLight"/>
         </LinearLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_color_picker.xml b/app/src/main/res/layout/fragment_color_picker.xml
index 120f2f15f..7ea840766 100644
--- a/app/src/main/res/layout/fragment_color_picker.xml
+++ b/app/src/main/res/layout/fragment_color_picker.xml
@@ -43,7 +43,7 @@
 		android:layout_margin="20dp"
 		android:text="@string/enable"
 		android:background="@drawable/background_button_small"
-		android:textColor="?attr/colorOnAccentColor"
+		android:textColor="?attr/colorOnSecondary"
 		android:theme="?attr/switchAppearance"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_progress.xml b/app/src/main/res/layout/fragment_progress.xml
index d2802a904..b812b8f24 100644
--- a/app/src/main/res/layout/fragment_progress.xml
+++ b/app/src/main/res/layout/fragment_progress.xml
@@ -70,7 +70,7 @@
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_dialog_bar"
-        app:indicatorColor="?attr/colorAccent"
+        app:indicatorColor="?attr/colorSecondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
diff --git a/app/src/main/res/layout/fragment_set_main_credential.xml b/app/src/main/res/layout/fragment_set_main_credential.xml
index a90a81b2b..6fd0b7f9f 100644
--- a/app/src/main/res/layout/fragment_set_main_credential.xml
+++ b/app/src/main/res/layout/fragment_set_main_credential.xml
@@ -86,7 +86,7 @@
                     android:importantForAutofill="no"
                     android:contentDescription="@string/content_description_repeat_toggle_password_visibility"
                     app:endIconMode="password_toggle"
-                    app:endIconTint="?attr/colorAccent">
+                    app:endIconTint="?attr/colorSecondary">
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/password_confirmation"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_set_otp.xml b/app/src/main/res/layout/fragment_set_otp.xml
index 3fc3e46a1..38e744a0f 100644
--- a/app/src/main/res/layout/fragment_set_otp.xml
+++ b/app/src/main/res/layout/fragment_set_otp.xml
@@ -114,7 +114,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:endIconMode="password_toggle"
-                    app:endIconTint="?attr/colorAccent">
+                    app:endIconTint="?attr/colorSecondary">
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/setup_otp_secret"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_breadcrumb.xml b/app/src/main/res/layout/item_breadcrumb.xml
index bd7b38d16..2426adf4f 100644
--- a/app/src/main/res/layout/item_breadcrumb.xml
+++ b/app/src/main/res/layout/item_breadcrumb.xml
@@ -56,7 +56,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_arrow_right_white_24dp"
-        android:tint="?attr/textColorInverse"
+        android:tint="?attr/colorOnPrimary"
         android:importantForAccessibility="no"
         android:layout_marginEnd="6dp"
         android:layout_marginRight="6dp"
diff --git a/app/src/main/res/layout/item_file_info.xml b/app/src/main/res/layout/item_file_info.xml
index bd1b66b38..e984ef17a 100644
--- a/app/src/main/res/layout/item_file_info.xml
+++ b/app/src/main/res/layout/item_file_info.xml
@@ -61,7 +61,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/default_file_button"
-                android:textColor="?attr/textColorInverse"
+                android:textColor="?attr/colorOnPrimary"
                 tools:text="DatabaseAlias" />
             <androidx.appcompat.widget.AppCompatCheckBox
                 android:id="@+id/default_file_button"
diff --git a/app/src/main/res/layout/item_tag.xml b/app/src/main/res/layout/item_tag.xml
index 20b544bb7..1d08eae1f 100644
--- a/app/src/main/res/layout/item_tag.xml
+++ b/app/src/main/res/layout/item_tag.xml
@@ -35,10 +35,10 @@
         android:layout_gravity="center"
         app:drawableLeftCompat="@drawable/ic_bookmark_white_12dp"
         app:drawableStartCompat="@drawable/ic_bookmark_white_12dp"
-        app:drawableTint="?attr/colorAccent"
+        app:drawableTint="?attr/colorSecondary"
         android:drawablePadding="2dp"
         tools:text="text"
-        android:textColor="?attr/colorAccent"
+        android:textColor="?attr/colorSecondary"
         android:textSize="12sp"
         android:paddingLeft="8dp"
         android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/item_tag_edit.xml b/app/src/main/res/layout/item_tag_edit.xml
index b520a9b4a..67c1526dc 100644
--- a/app/src/main/res/layout/item_tag_edit.xml
+++ b/app/src/main/res/layout/item_tag_edit.xml
@@ -33,7 +33,7 @@
         android:layout_gravity="center_vertical"
         app:drawableLeftCompat="@drawable/ic_bookmark_white_12dp"
         app:drawableStartCompat="@drawable/ic_bookmark_white_12dp"
-        app:drawableTint="?attr/colorAccent"
+        app:drawableTint="?attr/colorSecondary"
         android:drawablePadding="2dp"
         tools:text="text"
         android:textSize="12sp"
@@ -47,7 +47,7 @@
         android:layout_height="24dp"
         android:padding="4dp"
         android:src="@drawable/ic_close_white_24dp"
-        app:tint="?attr/colorAccent"
+        app:tint="?attr/colorSecondary"
         android:gravity="center_vertical"
         android:layout_gravity="center"
         android:contentDescription="@string/menu_delete" />
diff --git a/app/src/main/res/layout/nav_header_database.xml b/app/src/main/res/layout/nav_header_database.xml
index cfaa045a4..9ec685888 100644
--- a/app/src/main/res/layout/nav_header_database.xml
+++ b/app/src/main/res/layout/nav_header_database.xml
@@ -44,7 +44,7 @@
         android:layout_marginBottom="12dp"
         app:srcCompat="@drawable/ic_database_white_36dp"
         style="@style/KeepassDXStyle.Icon"
-        app:tint="?attr/colorAccent" />
+        app:tint="?attr/colorSecondary" />
 
     <ImageView
         android:id="@+id/nav_database_modified"
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/save"
         android:src="@drawable/ic_modified_white_12dp"
-        android:tint="?attr/textColorInverse"
+        app:tint="?attr/colorOnPrimary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/nav_database_icon"
         app:layout_constraintStart_toEndOf="@+id/nav_database_icon"
diff --git a/app/src/main/res/layout/pref_dialog_input_list.xml b/app/src/main/res/layout/pref_dialog_input_list.xml
index e184e4b88..196bab68b 100644
--- a/app/src/main/res/layout/pref_dialog_input_list.xml
+++ b/app/src/main/res/layout/pref_dialog_input_list.xml
@@ -42,7 +42,7 @@
 		android:layout_margin="24dp"
 		android:text="@string/enable"
 		android:background="@drawable/background_button_small"
-		android:textColor="?attr/textColorInverse"
+		android:textColor="?attr/colorOnSecondary"
 		android:theme="?attr/switchAppearance"
 		android:minHeight="48dp"/>
 
diff --git a/app/src/main/res/layout/view_button_add_node.xml b/app/src/main/res/layout/view_button_add_node.xml
index f2da52108..303b38a5f 100644
--- a/app/src/main/res/layout/view_button_add_node.xml
+++ b/app/src/main/res/layout/view_button_add_node.xml
@@ -52,8 +52,8 @@
             android:layout_marginEnd="@dimen/image_button_margin"
             android:src="@drawable/ic_key_white_24dp"
             android:contentDescription="@string/add_entry"
-            app:tint="?attr/colorOnAccentColor"
-            app:backgroundTint="?attr/colorAccent"
+            app:tint="?attr/colorOnSecondary"
+            app:backgroundTint="?attr/colorSecondary"
             app:fabSize="mini"
             app:fabCustomSize="@dimen/button_small_size"
             app:useCompatPadding="true" />
@@ -86,8 +86,8 @@
             android:layout_marginEnd="@dimen/image_button_margin"
             android:src="@drawable/ic_folder_white_24dp"
             android:contentDescription="@string/add_group"
-            app:tint="?attr/colorOnAccentColor"
-            app:backgroundTint="?attr/colorAccent"
+            app:tint="?attr/colorOnSecondary"
+            app:backgroundTint="?attr/colorSecondary"
             app:fabSize="mini"
             app:fabCustomSize="@dimen/button_small_size"
             app:useCompatPadding="true" />
@@ -103,7 +103,7 @@
         android:layout_alignParentBottom="true"
         android:contentDescription="@string/content_description_add_node"
         android:src="@drawable/ic_add_white_24dp"
-        app:tint="?attr/colorOnAccentColor"
+        app:tint="?attr/colorOnSecondary"
         app:fabSize="normal"
         app:useCompatPadding="true" />
 
diff --git a/app/src/main/res/layout/view_main_credentials.xml b/app/src/main/res/layout/view_main_credentials.xml
index 700d3030d..49af082a7 100644
--- a/app/src/main/res/layout/view_main_credentials.xml
+++ b/app/src/main/res/layout/view_main_credentials.xml
@@ -28,7 +28,7 @@
             android:layout_toStartOf="@+id/password_checkbox"
             android:layout_toLeftOf="@+id/password_checkbox"
             app:endIconMode="password_toggle"
-            app:endIconTint="?attr/colorAccent">
+            app:endIconTint="?attr/colorSecondary">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/password_text_view"
diff --git a/app/src/main/res/layout/view_passkey.xml b/app/src/main/res/layout/view_passkey.xml
index fa9c858a6..0bf582ffa 100644
--- a/app/src/main/res/layout/view_passkey.xml
+++ b/app/src/main/res/layout/view_passkey.xml
@@ -14,7 +14,7 @@
         android:importantForAccessibility="no"
         android:importantForAutofill="no"
         app:endIconMode="password_toggle"
-        app:endIconTint="?attr/colorAccent"
+        app:endIconTint="?attr/colorSecondary"
         tools:ignore="UnusedAttribute">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -45,7 +45,7 @@
         tools:text="Entropy: 72.50 bit"
         android:textSize="11sp"
         android:layout_margin="4dp"
-        android:textColor="?attr/colorAccent"
+        android:textColor="?attr/colorSecondary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/password_input_layout"
         app:layout_constraintEnd_toEndOf="@+id/password_input_layout" />
diff --git a/app/src/main/res/layout/view_search_filters.xml b/app/src/main/res/layout/view_search_filters.xml
index f48c67270..3565d8fc3 100644
--- a/app/src/main/res/layout/view_search_filters.xml
+++ b/app/src/main/res/layout/view_search_filters.xml
@@ -61,7 +61,7 @@
             style="@style/KeepassDXStyle.ImageButton.Simple"
             android:contentDescription="@string/search_filters"
             android:src="@drawable/ic_list_white_24dp"
-            app:tint="?attr/textColorInverse"/>
+            app:tint="?attr/colorOnPrimary"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <LinearLayout
         android:id="@+id/search_advance_filters"
diff --git a/app/src/main/res/values-v23/fingerprint.xml b/app/src/main/res/values-v23/fingerprint.xml
deleted file mode 100644
index aef4ccdf0..000000000
--- a/app/src/main/res/values-v23/fingerprint.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2015 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <integer name="fingerprint_viewport_width">160</integer>
-    <integer name="fingerprint_viewport_height">160</integer>
-    <integer name="fingerprint_viewport_center">80</integer>
-    <integer name="fingerprint_stroke_width">5</integer>
-    <integer name="tick_cross_stroke_width">7</integer>
-    <dimen name="advanced_unlock_size">80dp</dimen>
-
-    <!-- a pretty rough & ready re-draw of the fingerprint glyph from
-         https://github.com/googlesamples/android-FingerprintDialog -->
-    <string translatable="false" name="path_ridge_1">M56.2199243,45.3815903 C56.2199243,45.3815903 65.1913567,38.8543184 80.3604294,38.8543184 C95.5295022,38.8543184 103.720044,45.2851323 103.720044,45.2851323</string>
-    <string translatable="false" name="path_ridge_2">M45.5181172,67.9181841 C49.9761548,62.7019025 59.122049,49.7790452 80.2279027,49.7790452 C101.333756,49.7790452 110.740506,62.0384399 114.937688,67.9181841</string>
-    <string translatable="false" name="path_ridge_3">M51.7375623,107.718438 C51.7375623,107.718438 48.7129745,99.6302234 48.7129745,91.6334356 C48.7129745,81.3266864 55.9028711,60.2476586 80.4057228,60.2478671 C100.798248,60.2480407 112.457463,79.7942647 112.457463,88.386575 C112.457462,99.2963939 105.619846,103.039218 100.781849,102.18762 C95.9438519,101.336021 90.4490979,97.2187731 91.0639139,92.3178681 C91.67873,87.4169631 85.2177374,81.3265129 80.7504553,81.3266871 C73.0900115,81.3269859 69.8146331,85.3921834 69.8146329,92.2700585 C69.8146324,107.718437 83.7557525,121.02713 91.6787289,121.027128</string>
-    <string translatable="false" name="path_ridge_4">M70.7357889,121.024995 C70.7357889,121.024995 57.4650216,106.018711 58.8888756,91.5596242 C60.5513085,74.6777941 73.9858126,70.313752 80.3788823,70.3807995 C86.771952,70.4478469 101.550994,76.8218704 101.550997,92.2895418</string>
-    <string translatable="false" name="path_ridge_5">M80.1599645,91.1813411 C80.1599645,91.1813411 81.1144795,102.68333 86.7971146,107.529716 C93.2390527,113.023667 105.911091,112.342743 105.911091,112.342743</string>
-
-    <string translatable="false" name="path_tick">M52.2735573,79.0771904 C52.2735573,79.0771904 69.2403688,96.0440006 69.2403683,96.0440014 C69.2403679,96.0440021 109.820188,55.4641819 109.820188,55.4641819</string>
-
-    <string translatable="false" name="path_cross_1">M62,62 C62,62 80.5647617,80.5647617 80.564762,80.564762 C80.5647622,80.5647622 94.2921789,94.223714 98.5644262,98.5644262</string>
-    <string translatable="false" name="path_cross_2">M98.5644262,62 C98.5644251,62 81.1979242,79.366503 81.1979229,79.3665033 C81.1979216,79.3665035 62,98.5644262 62,98.5644262</string>
-
-    <!-- a 'window' which is ¼ of the height of the viewport that we use as a clip during the 'scan'
-         operation by animating it from the top to the bottom and back. -->
-    <string translatable="false" name="clip_path_scan_top">M0 0 L160 0 L160 40 L0 40 Z</string>
-    <string translatable="false" name="clip_path_scan_bottom">M0 120 L160 120 L160 160 L0 160 Z</string>
-
-    <color name="fingerprint_ridge">?attr/colorOnAccentColor</color>
-    <color name="fingerprint_ridge_scan">?attr/colorOnAccentColor</color>
-
-</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index cfb40ccd0..7b7f09221 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -29,11 +29,8 @@
     <attr name="chipFilterBackgroundColor" format="color" />
     <attr name="chipFilterBackgroundColorDisabled" format="color" />
 
-    <attr name="colorAccentLight" format="reference|color" />
     <attr name="cardBackgroundTransparentColor" format="reference|color" />
     <attr name="iconPreferenceColor" format="reference|color" />
-    <attr name="textColorInverse" format="reference|color" />
-    <attr name="colorOnAccentColor" format="reference|color" />
     <attr name="toolbarColorControl" format="reference|color" />
 
     <attr name="educationCircleColor" format="reference|color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8391598ff..793328008 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -70,6 +70,7 @@
     <color name="green_black_light">#24352A</color>
     <color name="green_black">#202923</color>
 
+    <color name="red_white_lightest">#FBECEE</color>
     <color name="red_white_light">#FCE6E8</color>
     <color name="red_lightest">#ef9a9a</color>
     <color name="red_lighter">#EF5350</color>
@@ -90,6 +91,7 @@
     <color name="white_purple">#F2EDFA</color>
     <color name="white_purple_light">#F7F3FD</color>
     <color name="white_purple_light_transparent">#E0F7F3FD</color>
+    <color name="purple_lightest">#F7D9FB</color>
     <color name="purple_lighter">#ce93d8</color>
     <color name="purple_light">#9048bc</color>
     <color name="purple">#743998</color>
@@ -112,6 +114,7 @@
 
     <color name="reply_orange_light">#FFBA52</color>
     <color name="reply_orange">#F9AA33</color>
+    <color name="reply_blue_lightest">#F6F8FA</color>
     <color name="reply_blue_lighter">#EDF0F2</color>
     <color name="reply_blue_light">#D1DBE0</color>
     <color name="reply_blue">#4A6572</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bcb7b8047..f475b3b1b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -49,9 +49,11 @@
 
         <item name="colorPrimary">@color/green</item>
         <item name="colorPrimaryDark">@color/green_dark</item>
-        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentLight">@color/orange_lighter</item>
+        <item name="colorOnPrimary">@color/white</item>
         <item name="colorSecondary">@color/orange</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/green_lightest</item>
+        <item name="colorOnTertiary">@color/green_white_dark</item>
 
         <item name="colorControlNormal">@color/grey_lighter</item>
         <item name="colorControlActivated">@color/orange</item>
@@ -65,7 +67,6 @@
         <item name="android:textColor">@color/text_color_light</item>
         <item name="android:textColorLink">@color/text_color_light</item>
         <item name="android:editTextColor">@color/grey_light</item>
-        <item name="textColorInverse">@color/white</item>
         <item name="android:textColorPrimary">@color/green_light</item>
         <item name="android:textColorPrimaryInverse">@color/white_darkest</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
@@ -75,8 +76,6 @@
 
         <item name="iconPreferenceColor">@color/text_color_secondary_light</item>
 
-        <item name="colorOnAccentColor">@color/white</item>
-
         <!-- Dialog -->
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
@@ -138,9 +137,11 @@
 
         <item name="colorPrimary">@color/green</item>
         <item name="colorPrimaryDark">@color/green_dark</item>
-        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentLight">@color/orange_lighter</item>
+        <item name="colorOnPrimary">@color/white</item>
         <item name="colorSecondary">@color/orange</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/green_black_light</item>
+        <item name="colorOnTertiary">@color/green_black</item>
 
         <item name="colorControlNormal">@color/grey_lighter</item>
         <item name="colorControlActivated">@color/orange</item>
@@ -154,7 +155,6 @@
         <item name="android:textColor">@color/text_color_night</item>
         <item name="android:textColorLink">@color/text_color_night</item>
         <item name="android:editTextColor">@color/white</item>
-        <item name="textColorInverse">@color/white</item>
         <item name="android:textColorPrimary">@color/green_light</item>
         <item name="android:textColorPrimaryInverse">@color/white_darkest</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_night</item>
@@ -164,8 +164,6 @@
 
         <item name="iconPreferenceColor">@color/text_color_secondary_night</item>
 
-        <item name="colorOnAccentColor">@color/white</item>
-
         <!-- Dialog -->
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
@@ -283,23 +281,23 @@
 
     <!-- Edit Text -->
     <style name="ThemeOverlay.KeepassDXTheme.TextInputEditText" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox">
-        <item name="colorControlActivated">?attr/colorAccent</item>
+        <item name="colorControlActivated">?attr/colorSecondary</item>
     </style>
     <style name="ThemeOverlay.KeepassDXTheme.CompleteTextView" parent="ThemeOverlay.Material3.AutoCompleteTextView.OutlinedBox">
-        <item name="colorControlActivated">?attr/colorAccent</item>
+        <item name="colorControlActivated">?attr/colorSecondary</item>
     </style>
     <style name="KeepassDXStyle.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="android:paddingTop">2dp</item>
         <item name="android:paddingBottom">2dp</item>
         <item name="boxStrokeColor">@color/edit_text_stroke_color</item>
-        <item name="hintTextColor">?attr/colorAccent</item>
+        <item name="hintTextColor">?attr/colorSecondary</item>
         <item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.TextInputEditText</item>
     </style>
     <style name="KeepassDXStyle.TextInputLayout.ExposedMenu" parent="Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
         <item name="android:paddingTop">2dp</item>
         <item name="android:paddingBottom">2dp</item>
         <item name="boxStrokeColor">@color/edit_text_stroke_color</item>
-        <item name="hintTextColor">?attr/colorAccent</item>
+        <item name="hintTextColor">?attr/colorSecondary</item>
         <item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.CompleteTextView</item>
     </style>
 
@@ -310,7 +308,7 @@
     <style name="KeepassDXStyle.Switch.Light" parent="KeepassDXStyle.Light">
         <item name="colorPrimary">@color/orange</item>
         <item name="colorOnPrimary">@color/green_white</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/orange</item>
         <item name="colorSurfaceVariant">@color/green_white</item>
@@ -318,7 +316,7 @@
     <style name="KeepassDXStyle.Switch.Night" parent="KeepassDXStyle.Night">
         <item name="colorPrimary">@color/orange</item>
         <item name="colorOnPrimary">@color/green_black_light</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/orange</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -350,7 +348,7 @@
 
     <!-- Dialog -->
     <style name="KeepassDXStyle.Light.Dialog" parent="ThemeOverlay.Material3.Dialog.Alert">
-        <item name="colorAccent">@color/orange</item>
+        <item name="colorSecondary">@color/orange</item>
         <item name="android:textColorPrimary">@color/green</item>
         <item name="android:background">@color/green_white</item>
         <item name="background">@color/green_white</item>
@@ -366,7 +364,7 @@
         <item name="android:textColor">@color/text_color_light</item>
     </style>
     <style name="KeepassDXStyle.Light.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog">
-        <item name="colorAccent">@color/orange</item>
+        <item name="colorSecondary">@color/orange</item>
         <item name="android:textColorPrimary">@color/green_dark</item>
         <item name="android:windowBackground">@color/green_white</item>
         <item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Light.Dialog.NegativeButtonStyle</item>
@@ -374,7 +372,7 @@
     </style>
 
     <style name="KeepassDXStyle.Night.Dialog" parent="ThemeOverlay.Material3.Dialog.Alert">
-        <item name="colorAccent">@color/orange</item>
+        <item name="colorSecondary">@color/orange</item>
         <item name="android:textColorPrimary">@color/green</item>
         <item name="android:background">@color/green_black_light</item>
         <item name="background">@color/green_black_light</item>
@@ -390,7 +388,7 @@
         <item name="android:textColor">@color/text_color_night</item>
     </style>
     <style name="KeepassDXStyle.Night.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog">
-        <item name="colorAccent">@color/orange_darker</item>
+        <item name="colorSecondary">@color/orange_darker</item>
         <item name="android:textColorPrimary">@color/green_light</item>
         <item name="android:windowBackground">@color/grey_dark</item>
         <item name="buttonBarStyle">@style/KeepassDXStyle.Night.Dialog.NegativeButtonStyle</item>
@@ -426,8 +424,8 @@
         <item name="android:textColor">?android:attr/textColor</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Default.TextOnPrimary" parent="android:style/TextAppearance">
-        <item name="android:textColor">?attr/textColorInverse</item>
-        <item name="drawableTint">?attr/textColorInverse</item>
+        <item name="android:textColor">?attr/colorOnPrimary</item>
+        <item name="drawableTint">?attr/colorOnPrimary</item>
         <item name="android:drawablePadding">8dp</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
@@ -436,7 +434,7 @@
         <item name="android:textStyle">italic</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Warning.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
-        <item name="android:textColor">?attr/textColorInverse</item>
+        <item name="android:textColor">?attr/colorOnPrimary</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">italic</item>
     </style>
@@ -481,18 +479,18 @@
     </style>
     <style name="KeepassDXStyle.TextAppearance.Tiny.Secondary" parent="KeepassDXStyle.TextAppearance">
         <item name="android:textSize">12sp</item>
-        <item name="android:textColor">?attr/colorAccent</item>
+        <item name="android:textColor">?attr/colorSecondary</item>
     </style>
 
     <style name="KeepassDXStyle.TextAppearance.Warning" parent="KeepassDXStyle.TextAppearance">
-		<item name="android:textColor">?attr/colorAccent</item>
+		<item name="android:textColor">?attr/colorSecondary</item>
 	</style>
 
     <style name="KeepassDXStyle.TextAppearance.Info" parent="KeepassDXStyle.TextAppearance">
         <item name="android:textSize">12sp</item>
-        <item name="android:textColor">?attr/colorOnAccentColor</item>
+        <item name="android:textColor">?attr/colorOnSecondary</item>
         <item name="android:background">@drawable/background_rounded_square</item>
-        <item name="backgroundTint">?attr/colorAccent</item>
+        <item name="backgroundTint">?attr/colorSecondary</item>
     </style>
 
     <!-- Nodes Text Style -->
@@ -536,16 +534,16 @@
     </style>
 
     <!-- Button Style -->
-    <style name="KeepassDXStyle.Button.Primary" parent="Widget.Material3.Button">
-        <item name="android:textColor">?attr/textColorInverse</item>
-        <item name="backgroundTint">@color/background_button_color_primary</item>
-        <item name="iconTint">?attr/textColorInverse</item>
+    <style name="KeepassDXStyle.Button.Primary" parent="Widget.Material3.Button.ElevatedButton">
+        <item name="backgroundTint">@color/color_button_primary</item>
+        <item name="android:textColor">@color/color_on_button_primary</item>
+        <item name="iconTint">@color/color_on_button_primary</item>
         <item name="android:layout_margin">8dp</item>
     </style>
     <style name="KeepassDXStyle.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="strokeColor">@color/background_button_color_secondary</item>
-        <item name="android:textColor">@color/background_button_color_secondary</item>
-        <item name="iconTint">@color/background_button_color_secondary</item>
+        <item name="strokeColor">@color/color_button_secondary</item>
+        <item name="android:textColor">@color/color_button_secondary</item>
+        <item name="iconTint">@color/color_button_secondary</item>
         <item name="android:layout_margin">8dp</item>
     </style>
     <style name="KeepassDXStyle.Base.ImageButton" parent="Widget.AppCompat.ImageButton" />
@@ -553,13 +551,13 @@
         <item name="android:gravity">center</item>
     </style>
     <style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.v21.ImageButton">
-        <item name="android:colorForeground">?attr/textColorInverse</item>
+        <item name="android:colorForeground">?attr/colorOnSecondary</item>
         <item name="android:background">@drawable/background_image_button</item>
-        <item name="backgroundTint">@color/background_button_color_secondary</item>
+        <item name="backgroundTint">@color/color_button_secondary</item>
     </style>
     <style name="KeepassDXStyle.ImageButton.Simple" parent="KeepassDXStyle.v21.ImageButton">
-        <item name="android:colorForeground">@color/background_button_color_secondary</item>
-        <item name="tint">@color/background_button_color_secondary</item>
+        <item name="android:colorForeground">@color/color_button_secondary</item>
+        <item name="tint">@color/color_button_secondary</item>
         <item name="android:background">?android:attr/actionBarItemBackground</item>
         <item name="backgroundTint">@null</item>
         <item name="android:padding">12dp</item>
@@ -596,7 +594,7 @@
     </style>
     <style name="KeepassDXStyle.Fab.Special" parent="KeepassDXStyle.v21.Fab">
         <item name="backgroundTint">?attr/colorPrimary</item>
-        <item name="tint">?attr/textColorInverse</item>
+        <item name="tint">?attr/colorOnPrimary</item>
     </style>
 
     <!-- Menu FAB -->
@@ -604,14 +602,14 @@
     </style>
     <style name="KeepassDXStyle.FabMenu" parent="KeepassDXStyle.v21.FabMenu">
         <item name="android:textSize">15sp</item>
-        <item name="android:textColor">?attr/colorOnAccentColor</item>
+        <item name="android:textColor">?attr/colorOnSecondary</item>
         <item name="android:background">@drawable/background_button_small</item>
-        <item name="backgroundTint">@color/background_button_color_secondary</item>
+        <item name="backgroundTint">@color/color_button_secondary</item>
     </style>
 
     <!-- Form -->
 	<style name="KeepassDXStyle.TextAppearance.LabelTextStyle" parent="KeepassDXStyle.TextAppearance">
-        <item name="android:textColor">?attr/colorAccent</item>
+        <item name="android:textColor">?attr/colorSecondary</item>
 		<item name="android:textSize">12sp</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:paddingStart">4dp</item>
diff --git a/app/src/main/res/values/styles_classic.xml b/app/src/main/res/values/styles_classic.xml
index 2ca88a176..1e7d0b63f 100644
--- a/app/src/main/res/values/styles_classic.xml
+++ b/app/src/main/res/values/styles_classic.xml
@@ -26,8 +26,11 @@
     <style name="KeepassDXStyle.Clear.Base" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/white_grey_lighter</item>
         <item name="colorPrimaryDark">@color/white_grey_light</item>
-        <item name="colorAccent">@color/cyan_lighter</item>
-        <item name="colorAccentLight">@color/cyan_lightest</item>
+        <item name="colorOnPrimary">@color/grey_light</item>
+        <item name="colorSecondary">@color/cyan_lighter</item>
+        <item name="colorOnSecondary">@color/white_darkest</item>
+        <item name="colorTertiary">@color/white_grey_lighter</item>
+        <item name="colorOnTertiary">@color/white</item>
         <item name="colorControlActivated">@color/cyan_lightest</item>
         <item name="android:textColorPrimary">@color/cyan_lightest</item>
         <item name="android:textColorHintInverse">@color/cyan_lightest</item>
@@ -48,7 +51,6 @@
         <item name="android:textColor">@color/text_color_light</item>
         <item name="android:textColorLink">@color/text_color_light</item>
         <item name="android:editTextColor">@color/grey_light</item>
-        <item name="textColorInverse">@color/grey_light</item>
         <item name="android:textColorPrimaryInverse">@color/grey_light</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
@@ -91,13 +93,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/cyan_lighter</item>
+        <item name="colorSecondary">@color/cyan_lighter</item>
         <item name="android:textColorPrimary">@color/cyan</item>
         <item name="android:background">@color/white_grey_lighter</item>
         <item name="background">@color/white_grey_lighter</item>
     </style>
     <style name="KeepassDXStyle.Clear.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/cyan_lighter</item>
+        <item name="colorSecondary">@color/cyan_lighter</item>
         <item name="android:textColorPrimary">@color/cyan</item>
         <item name="android:windowBackground">@color/white_grey_lighter</item>
     </style>
@@ -111,8 +113,10 @@
     <style name="KeepassDXStyle.Dark.v21" parent="KeepassDXStyle.Night" >
         <item name="colorPrimary">@color/grey_darker</item>
         <item name="colorPrimaryDark">@color/black_light</item>
-        <item name="colorAccent">@color/cyan</item>
-        <item name="colorAccentLight">@color/cyan_lightest</item>
+        <item name="colorSecondary">@color/cyan</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/black_light</item>
+        <item name="colorOnTertiary">@color/black</item>
         <item name="colorControlActivated">@color/cyan_lightest</item>
         <item name="android:textColorPrimary">@color/cyan_lightest</item>
         <item name="android:textColorHintInverse">@color/cyan_lightest</item>
@@ -162,13 +166,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/cyan_lighter</item>
+        <item name="colorSecondary">@color/cyan_lighter</item>
         <item name="android:textColorPrimary">@color/cyan_lightest</item>
         <item name="android:background">@color/black_lighter</item>
         <item name="background">@color/black_lighter</item>
     </style>
     <style name="KeepassDXStyle.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorAccent">@color/cyan_lighter</item>
+        <item name="colorSecondary">@color/cyan_lighter</item>
         <item name="android:textColorPrimary">@color/cyan_lightest</item>
         <item name="android:windowBackground">@color/black_lighter</item>
     </style>
@@ -180,7 +184,7 @@
     <style name="KeepassDXStyle.Switch.Clear" parent="KeepassDXStyle.Clear">
         <item name="colorPrimary">@color/cyan_lighter</item>
         <item name="colorOnPrimary">?android:attr/windowBackground</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">?attr/colorPrimary</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -188,7 +192,7 @@
     <style name="KeepassDXStyle.Switch.Dark" parent="KeepassDXStyle.Dark">
         <item name="colorPrimary">@color/cyan_lighter</item>
         <item name="colorOnPrimary">?android:attr/windowBackground</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">?attr/colorPrimary</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
diff --git a/app/src/main/res/values/styles_divine.xml b/app/src/main/res/values/styles_divine.xml
index 5659f5b0c..f52bd02c1 100644
--- a/app/src/main/res/values/styles_divine.xml
+++ b/app/src/main/res/values/styles_divine.xml
@@ -26,9 +26,11 @@
     <style name="KeepassDXStyle.White.Base" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryDark">@color/white</item>
+        <item name="colorOnPrimary">@color/grey_light</item>
         <item name="colorSecondary">@color/orange</item>
-        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentLight">@color/orange_lighter</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/white_darkest</item>
+        <item name="colorOnTertiary">@color/white</item>
         <item name="colorControlNormal">@color/grey_light</item>
         <item name="colorControlActivated">@color/orange</item>
         <item name="android:textColorPrimary">@color/orange_light</item>
@@ -50,7 +52,6 @@
         <item name="android:textColor">@color/text_color_light</item>
         <item name="android:textColorLink">@color/text_color_light</item>
         <item name="android:editTextColor">@color/grey_light</item>
-        <item name="textColorInverse">@color/grey_light</item>
         <item name="android:textColorPrimaryInverse">@color/grey_light</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
@@ -96,13 +97,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/orange</item>
+        <item name="colorSecondary">@color/orange</item>
         <item name="android:textColorPrimary">@color/grey_light</item>
         <item name="android:background">@color/white</item>
         <item name="background">@color/white</item>
     </style>
     <style name="KeepassDXStyle.White.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/orange</item>
+        <item name="colorSecondary">@color/orange</item>
         <item name="android:textColorPrimary">@color/orange_darker</item>
         <item name="android:windowBackground">@color/white</item>
     </style>
@@ -116,8 +117,10 @@
     <style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Night.v21" >
         <item name="colorPrimary">@color/black_light</item>
         <item name="colorPrimaryDark">@color/black</item>
-        <item name="colorAccent">@color/orange_darker</item>
-        <item name="colorAccentLight">@color/orange</item>
+        <item name="colorSecondary">@color/orange_darker</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/black_light</item>
+        <item name="colorOnTertiary">@color/black</item>
         <item name="colorControlNormal">@color/grey_light</item>
         <item name="colorControlActivated">@color/orange</item>
         <item name="android:textColorPrimary">@color/orange_lighter</item>
@@ -175,13 +178,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/orange_darker</item>
+        <item name="colorSecondary">@color/orange_darker</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:background">@color/black_lighter</item>
         <item name="background">@color/black_lighter</item>
     </style>
     <style name="KeepassDXStyle.Black.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorAccent">@color/orange_darker</item>
+        <item name="colorSecondary">@color/orange_darker</item>
         <item name="android:textColorPrimary">@color/orange</item>
         <item name="android:windowBackground">@color/black_lighter</item>
     </style>
@@ -193,7 +196,7 @@
     <style name="KeepassDXStyle.Switch.White" parent="KeepassDXStyle.White">
         <item name="colorPrimary">@color/orange</item>
         <item name="colorOnPrimary">?android:attr/windowBackground</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">?attr/colorPrimary</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -201,7 +204,7 @@
     <style name="KeepassDXStyle.Switch.Black" parent="KeepassDXStyle.Black">
         <item name="colorPrimary">@color/orange_darker</item>
         <item name="colorOnPrimary">?android:attr/windowBackground</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">?attr/colorPrimary</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
diff --git a/app/src/main/res/values/styles_kunzite.xml b/app/src/main/res/values/styles_kunzite.xml
index 6243e7917..ffc30144e 100644
--- a/app/src/main/res/values/styles_kunzite.xml
+++ b/app/src/main/res/values/styles_kunzite.xml
@@ -23,8 +23,11 @@
     <style name="KeepassDXStyle.Purple.v21" parent="KeepassDXStyle.Light.v21" >
         <item name="colorPrimary">@color/purple</item>
         <item name="colorPrimaryDark">@color/purple_dark</item>
-        <item name="colorAccent">@color/red</item>
-        <item name="colorAccentLight">@color/red_light</item>
+        <item name="colorOnPrimary">@color/white_purple</item>
+        <item name="colorSecondary">@color/red</item>
+        <item name="colorOnSecondary">@color/purple_lighter</item>
+        <item name="colorTertiary">@color/purple_lightest</item>
+        <item name="colorOnTertiary">@color/white_purple_light</item>
         <item name="colorControlActivated">@color/red_light</item>
         <item name="android:textColorPrimary">@color/purple_light</item>
         <item name="android:textColorHintInverse">@color/purple_lighter</item>
@@ -82,13 +85,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/purple_light</item>
         <item name="android:background">@color/white_purple</item>
         <item name="background">@color/white_purple</item>
     </style>
     <style name="KeepassDXStyle.Purple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/purple_light</item>
         <item name="android:windowBackground">@color/white_purple</item>
     </style>
@@ -102,8 +105,11 @@
     <style name="KeepassDXStyle.Purple.Dark.v21" parent="KeepassDXStyle.Night.v21" >
         <item name="colorPrimary">@color/purple_darker</item>
         <item name="colorPrimaryDark">@color/black_purple</item>
-        <item name="colorAccent">@color/red</item>
-        <item name="colorAccentLight">@color/red_light</item>
+        <item name="colorOnPrimary">@color/white_purple_light</item>
+        <item name="colorSecondary">@color/red</item>
+        <item name="colorOnSecondary">@color/white_purple_light</item>
+        <item name="colorTertiary">@color/black_purple</item>
+        <item name="colorOnTertiary">@color/black_purple_dark</item>
         <item name="colorControlActivated">@color/red_light</item>
         <item name="android:textColorPrimary">@color/purple_lighter</item>
         <item name="android:textColorHintInverse">@color/purple_lighter</item>
@@ -162,13 +168,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/purple_lighter</item>
         <item name="android:background">@color/black_purple_dark</item>
         <item name="background">@color/black_purple_dark</item>
     </style>
     <style name="KeepassDXStyle.Purple.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/purple_lighter</item>
         <item name="android:windowBackground">@color/black_purple_dark</item>
     </style>
@@ -180,7 +186,7 @@
     <style name="KeepassDXStyle.Switch.Purple" parent="KeepassDXStyle.Purple">
         <item name="colorPrimary">@color/purple</item>
         <item name="colorOnPrimary">@color/white_purple_light</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/purple_light</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -188,7 +194,7 @@
     <style name="KeepassDXStyle.Switch.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">
         <item name="colorPrimary">@color/purple</item>
         <item name="colorOnPrimary">@color/purple_darker</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/purple_dark</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
diff --git a/app/src/main/res/values/styles_moon.xml b/app/src/main/res/values/styles_moon.xml
index b1d006b8d..7512533a8 100644
--- a/app/src/main/res/values/styles_moon.xml
+++ b/app/src/main/res/values/styles_moon.xml
@@ -23,8 +23,11 @@
     <style name="KeepassDXStyle.Blue.v21" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/blue</item>
         <item name="colorPrimaryDark">@color/blue_dark</item>
-        <item name="colorAccent">@color/blue_lighter</item>
-        <item name="colorAccentLight">@color/blue_white_dark</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorSecondary">@color/blue_lighter</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/blue_white_dark</item>
+        <item name="colorOnTertiary">@color/blue_white</item>
         <item name="colorControlActivated">@color/blue_lighter</item>
         <item name="android:textColorPrimary">@color/blue_light</item>
         <item name="android:textColorHintInverse">@color/blue_white_dark</item>
@@ -77,13 +80,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/blue_white_dark</item>
+        <item name="colorSecondary">@color/blue_white_dark</item>
         <item name="android:textColorPrimary">@color/blue</item>
         <item name="android:background">@color/blue_white_light</item>
         <item name="background">@color/blue_white_light</item>
     </style>
     <style name="KeepassDXStyle.Blue.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/blue</item>
+        <item name="colorSecondary">@color/blue</item>
         <item name="android:textColorPrimary">@color/blue</item>
         <item name="android:windowBackground">@color/white_dark</item>
     </style>
@@ -94,8 +97,11 @@
     <style name="KeepassDXStyle.Blue.Night.v21" parent="KeepassDXStyle.Night" >
         <item name="colorPrimary">@color/blue</item>
         <item name="colorPrimaryDark">@color/blue_dark</item>
-        <item name="colorAccent">@color/blue_lighter</item>
-        <item name="colorAccentLight">@color/blue_white_dark</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorSecondary">@color/blue_lighter</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/blue_black</item>
+        <item name="colorOnTertiary">@color/blue_black_dark</item>
         <item name="colorControlActivated">@color/blue_lighter</item>
         <item name="android:textColorPrimary">@color/blue_light</item>
         <item name="android:textColorHintInverse">@color/blue_white_dark</item>
@@ -147,13 +153,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/blue_white_dark</item>
+        <item name="colorSecondary">@color/blue_white_dark</item>
         <item name="android:textColorPrimary">@color/blue</item>
         <item name="android:background">@color/blue_black_dark</item>
         <item name="background">@color/blue_black_dark</item>
     </style>
     <style name="KeepassDXStyle.Blue.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorAccent">@color/blue</item>
+        <item name="colorSecondary">@color/blue</item>
         <item name="android:textColorPrimary">@color/blue</item>
         <item name="android:windowBackground">@color/grey_dark</item>
     </style>
@@ -167,14 +173,14 @@
     <!-- Switch -->
     <style name="KeepassDXStyle.Switch.Blue" parent="KeepassDXStyle.Blue">
         <item name="colorOnPrimary">@color/blue_white_light</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/blue_lighter</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
     </style>
     <style name="KeepassDXStyle.Switch.Blue.Night" parent="KeepassDXStyle.Blue.Night">
         <item name="colorOnPrimary">@color/blue_black_dark</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/blue_lighter</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
diff --git a/app/src/main/res/values/styles_reply.xml b/app/src/main/res/values/styles_reply.xml
index 6891e8292..49a2ccfea 100644
--- a/app/src/main/res/values/styles_reply.xml
+++ b/app/src/main/res/values/styles_reply.xml
@@ -23,9 +23,12 @@
     <style name="KeepassDXStyle.Reply.v21" parent="KeepassDXStyle.Light.v21" >
         <item name="colorPrimary">@color/reply_blue_dark</item>
         <item name="colorPrimaryDark">@color/reply_blue</item>
-        <item name="colorAccent">@color/reply_orange</item>
-        <item name="colorAccentLight">@color/reply_orange_light</item>
-        <item name="colorControlActivated">@color/reply_blue_light</item>
+        <item name="colorOnPrimary">@color/reply_blue_light</item>
+        <item name="colorSecondary">@color/reply_orange</item>
+        <item name="colorOnSecondary">@color/reply_black</item>
+        <item name="colorTertiary">@color/reply_blue_light</item>
+        <item name="colorOnTertiary">@color/reply_blue_lighter</item>
+        <item name="colorControlActivated">@color/reply_blue</item>
         <item name="android:textColorPrimary">@color/reply_blue</item>
         <item name="android:textColorHintInverse">@color/reply_orange</item>
         <item name="android:textColorSecondaryInverse">@color/reply_orange</item>
@@ -38,9 +41,9 @@
         <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
+        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Reply.Light</item>
         <item name="educationCircleColor">@color/reply_orange</item>
         <item name="educationTextColor">@color/reply_black</item>
-        <item name="colorOnAccentColor">@color/reply_black</item>
 
         <item name="chipFilterTextColor">@color/reply_black</item>
         <item name="chipFilterBackgroundColor">@color/reply_orange</item>
@@ -82,16 +85,20 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Reply.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/reply_orange</item>
+        <item name="colorSecondary">@color/reply_orange</item>
         <item name="android:textColorPrimary">@color/reply_blue_dark</item>
         <item name="android:background">@color/reply_blue_lighter</item>
         <item name="background">@color/reply_blue_lighter</item>
     </style>
     <style name="KeepassDXStyle.Reply.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/reply_blue_dark</item>
+        <item name="colorSecondary">@color/reply_blue_dark</item>
         <item name="android:textColorPrimary">@color/reply_blue_dark</item>
         <item name="android:windowBackground">@color/reply_blue_lighter</item>
     </style>
+    <!-- CardView -->
+    <style name="KeepassDXStyle.Cardview.Reply.Light" parent="KeepassDXStyle.Cardview">
+        <item name="cardBackgroundColor">@color/reply_blue_lightest</item>
+    </style>
 
 
     <!-- Dark Reply Style -->
@@ -99,8 +106,11 @@
     <style name="KeepassDXStyle.Reply.Night.v21" parent="KeepassDXStyle.Night.v21" >
         <item name="colorPrimary">@color/reply_blue_dark</item>
         <item name="colorPrimaryDark">@color/reply_black</item>
-        <item name="colorAccent">@color/reply_orange</item>
-        <item name="colorAccentLight">@color/reply_orange_light</item>
+        <item name="colorOnPrimary">@color/reply_blue_light</item>
+        <item name="colorSecondary">@color/reply_orange</item>
+        <item name="colorOnSecondary">@color/reply_black</item>
+        <item name="colorTertiary">@color/reply_black_dark</item>
+        <item name="colorOnTertiary">@color/reply_black</item>
         <item name="colorControlActivated">@color/reply_blue_light</item>
         <item name="android:textColorPrimary">@color/reply_blue_lighter</item>
         <item name="android:textColorHintInverse">@color/reply_blue_light</item>
@@ -117,7 +127,6 @@
         <item name="cardBackgroundTransparentColor">@color/reply_black_transparent</item>
         <item name="educationCircleColor">@color/reply_orange</item>
         <item name="educationTextColor">@color/reply_black</item>
-        <item name="colorOnAccentColor">@color/reply_black</item>
 
         <item name="chipFilterTextColor">@color/reply_black</item>
         <item name="chipFilterBackgroundColor">@color/reply_orange</item>
@@ -159,13 +168,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Reply.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/reply_blue_lighter</item>
+        <item name="colorSecondary">@color/reply_blue_lighter</item>
         <item name="android:textColorPrimary">@color/reply_orange</item>
         <item name="android:background">@color/reply_black</item>
         <item name="background">@color/reply_black</item>
     </style>
     <style name="KeepassDXStyle.Reply.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorAccent">@color/reply_blue_dark</item>
+        <item name="colorSecondary">@color/reply_blue_dark</item>
         <item name="android:textColorPrimary">@color/reply_orange</item>
         <item name="android:windowBackground">@color/reply_black</item>
     </style>
@@ -176,8 +185,8 @@
     <!-- Switch -->
     <style name="KeepassDXStyle.Switch.Reply" parent="KeepassDXStyle.Reply">
         <item name="colorPrimary">@color/reply_orange</item>
-        <item name="colorOnPrimary">@color/reply_blue_light</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnPrimary">@color/reply_blue_lightest</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/reply_orange</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -185,7 +194,7 @@
     <style name="KeepassDXStyle.Switch.Reply.Night" parent="KeepassDXStyle.Reply.Night">
         <item name="colorPrimary">@color/reply_orange</item>
         <item name="colorOnPrimary">@color/reply_black</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/reply_orange</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
diff --git a/app/src/main/res/values/styles_simple.xml b/app/src/main/res/values/styles_simple.xml
index 8dbf9e328..69e3e1d84 100644
--- a/app/src/main/res/values/styles_simple.xml
+++ b/app/src/main/res/values/styles_simple.xml
@@ -26,8 +26,11 @@
     <style name="KeepassDXStyle.Simple.Base" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/white_slight</item>
         <item name="colorPrimaryDark">@color/white_slight</item>
-        <item name="colorAccent">@color/blue_deep</item>
-        <item name="colorAccentLight">@color/blue_deep</item>
+        <item name="colorOnPrimary">@color/grey_light</item>
+        <item name="colorSecondary">@color/blue_deep</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/white_darkest</item>
+        <item name="colorOnTertiary">@color/white</item>
         <item name="colorControlActivated">@color/blue_deep</item>
         <item name="android:textColorPrimary">@color/grey</item>
         <item name="android:textColorHintInverse">@color/grey</item>
@@ -48,7 +51,6 @@
         <item name="android:textColor">@color/text_color_light</item>
         <item name="android:textColorLink">@color/text_color_light</item>
         <item name="android:editTextColor">@color/grey_light</item>
-        <item name="textColorInverse">@color/grey_light</item>
         <item name="android:textColorPrimaryInverse">@color/grey_light</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
@@ -91,13 +93,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Simple.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/blue_deep</item>
+        <item name="colorSecondary">@color/blue_deep</item>
         <item name="android:textColorPrimary">@color/grey</item>
         <item name="android:background">@color/white_slight</item>
         <item name="background">@color/white_slight</item>
     </style>
     <style name="KeepassDXStyle.Simple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/blue_deep</item>
+        <item name="colorSecondary">@color/blue_deep</item>
         <item name="android:textColorPrimary">@color/grey</item>
         <item name="android:windowBackground">@color/white_slight</item>
     </style>
@@ -111,8 +113,10 @@
     <style name="KeepassDXStyle.Simple.Night.v21" parent="KeepassDXStyle.Night" >
         <item name="colorPrimary">@color/grey_slight</item>
         <item name="colorPrimaryDark">@color/grey_slight</item>
-        <item name="colorAccent">@color/blue_slight</item>
-        <item name="colorAccentLight">@color/blue_slight</item>
+        <item name="colorSecondary">@color/blue_slight</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/black_light</item>
+        <item name="colorOnTertiary">@color/black</item>
         <item name="colorControlActivated">@color/blue_slight</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:textColorHintInverse">@color/white</item>
@@ -162,13 +166,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Simple.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/blue_slight</item>
+        <item name="colorSecondary">@color/blue_slight</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:background">@color/grey_slight</item>
         <item name="background">@color/grey_slight</item>
     </style>
     <style name="KeepassDXStyle.Simple.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorAccent">@color/blue_slight</item>
+        <item name="colorSecondary">@color/blue_slight</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:windowBackground">@color/grey_slight</item>
     </style>
@@ -180,7 +184,7 @@
     <style name="KeepassDXStyle.Switch.Simple" parent="KeepassDXStyle.Simple">
         <item name="colorPrimary">@color/blue_slight</item>
         <item name="colorOnPrimary">?android:attr/windowBackground</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">?attr/colorPrimary</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -188,7 +192,7 @@
     <style name="KeepassDXStyle.Switch.Simple.Night" parent="KeepassDXStyle.Simple.Night">
         <item name="colorPrimary">@color/blue_slight</item>
         <item name="colorOnPrimary">?android:attr/windowBackground</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">?attr/colorPrimary</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
diff --git a/app/src/main/res/values/styles_sun.xml b/app/src/main/res/values/styles_sun.xml
index 0735c5aa1..d0613ea82 100644
--- a/app/src/main/res/values/styles_sun.xml
+++ b/app/src/main/res/values/styles_sun.xml
@@ -23,8 +23,11 @@
     <style name="KeepassDXStyle.Red.v21" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/red</item>
         <item name="colorPrimaryDark">@color/red_dark</item>
-        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentLight">@color/orange_lighter</item>
+        <item name="colorOnPrimary">@color/red_white_light</item>
+        <item name="colorSecondary">@color/orange</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/red_lightest</item>
+        <item name="colorOnTertiary">@color/red_white_light</item>
         <item name="colorControlActivated">@color/orange</item>
         <item name="android:textColorPrimary">@color/red</item>
         <item name="android:textColorHintInverse">@color/red_lightest</item>
@@ -77,13 +80,13 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/orange</item>
         <item name="android:background">@color/red_white_light</item>
         <item name="background">@color/red_white_light</item>
     </style>
     <style name="KeepassDXStyle.Red.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/orange</item>
         <item name="android:windowBackground">@color/white_dark</item>
     </style>
@@ -93,8 +96,11 @@
     <style name="KeepassDXStyle.Red.Night.v21" parent="KeepassDXStyle.Night" >
         <item name="colorPrimary">@color/red</item>
         <item name="colorPrimaryDark">@color/red_dark</item>
-        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentLight">@color/orange_lighter</item>
+        <item name="colorOnPrimary">@color/red_white_light</item>
+        <item name="colorSecondary">@color/orange</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorTertiary">@color/red_black</item>
+        <item name="colorOnTertiary">@color/red_black_dark</item>
         <item name="colorControlActivated">@color/orange</item>
         <item name="android:textColorPrimary">@color/red</item>
         <item name="android:textColorHintInverse">@color/red_lightest</item>
@@ -146,19 +152,19 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/orange</item>
         <item name="android:background">@color/red_black_dark</item>
         <item name="background">@color/red_black_dark</item>
     </style>
     <style name="KeepassDXStyle.Red.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorAccent">@color/red</item>
+        <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/orange</item>
         <item name="android:windowBackground">@color/grey_dark</item>
     </style>
     <!-- CardView -->
     <style name="KeepassDXStyle.Cardview.Red" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/red_white_light</item>
+        <item name="cardBackgroundColor">@color/red_white_lightest</item>
     </style>
     <style name="KeepassDXStyle.Cardview.Red.Night" parent="KeepassDXStyle.Cardview">
         <item name="cardBackgroundColor">@color/red_black</item>
@@ -166,8 +172,8 @@
     <!-- Switch -->
     <style name="KeepassDXStyle.Switch.Red" parent="KeepassDXStyle.Red">
         <item name="colorPrimary">@color/orange</item>
-        <item name="colorOnPrimary">@color/red_white_light</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnPrimary">@color/red_white_lightest</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/orange</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -175,7 +181,7 @@
     <style name="KeepassDXStyle.Switch.Red.Night" parent="KeepassDXStyle.Red.Night">
         <item name="colorPrimary">@color/orange_dark</item>
         <item name="colorOnPrimary">@color/red_black_dark</item>
-        <item name="colorOnAccentColor">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/orange_dark</item>
         <item name="colorSurfaceVariant">?android:attr/windowBackground</item>