diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cd0ada9c..13c7b6d9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -56,7 +56,6 @@ android {
     buildFeatures {
         compose = true
         viewBinding = true
-        dataBinding = true
     }
 
     flavorDimensions("default")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eaa3d566..b5743cc1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,9 +20,6 @@
         <activity
             android:name=".ui.CrashActivity"
             android:exported="false" />
-        <activity
-            android:name=".ui.addTOTP.ScannerActivity"
-            android:exported="false" />
         <activity
             android:name=".ui.generate.GeneratePasswordActivity"
             android:exported="true" />
diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/ScannerActivity.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/ScannerActivity.kt
deleted file mode 100644
index 887c87c3..00000000
--- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/addTOTP/ScannerActivity.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.yogeshpaliyal.keypass.ui.addTOTP
-
-import android.app.Activity
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.yogeshpaliyal.common.constants.RequestCodes
-import com.yogeshpaliyal.keypass.databinding.ActivityScannerBinding
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class ScannerActivity : AppCompatActivity() {
-
-    private lateinit var binding: ActivityScannerBinding
-
-    private val REQUEST_CAM_PERMISSION = 432
-
-    companion object {
-        @JvmStatic
-        fun start(activity: Activity) {
-            val starter = Intent(activity, ScannerActivity::class.java)
-            activity.startActivityForResult(starter, RequestCodes.SCANNER)
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityScannerBinding.inflate(layoutInflater)
-
-        setContentView(binding.root)
-
-        setSupportActionBar(binding.toolbar)
-
-        binding.toolbar.setNavigationOnClickListener {
-            onBackPressed()
-        }
-    }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == REQUEST_CAM_PERMISSION) {
-            if (isAllRequestGranted(grantResults)) {
-                // codeScanner?.startPreview()
-            }
-        }
-    }
-
-    private fun isAllRequestGranted(grantResults: IntArray) =
-        grantResults.all { it == PackageManager.PERMISSION_GRANTED }
-}
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
deleted file mode 100644
index 6d147990..00000000
--- a/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_feedback_24.xml b/app/src/main/res/drawable/ic_baseline_feedback_24.xml
deleted file mode 100644
index 170a74b1..00000000
--- a/app/src/main/res/drawable/ic_baseline_feedback_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,14h-2v-2h2v2zM13,10h-2L11,6h2v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_share_24.xml b/app/src/main/res/drawable/ic_baseline_share_24.xml
deleted file mode 100644
index 2f13bb3e..00000000
--- a/app/src/main/res/drawable/ic_baseline_share_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_round_done_24.xml b/app/src/main/res/drawable/ic_round_done_24.xml
deleted file mode 100644
index 6a86ea58..00000000
--- a/app/src/main/res/drawable/ic_round_done_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9,16.2l-3.5,-3.5c-0.39,-0.39 -1.01,-0.39 -1.4,0 -0.39,0.39 -0.39,1.01 0,1.4l4.19,4.19c0.39,0.39 1.02,0.39 1.41,0L20.3,7.7c0.39,-0.39 0.39,-1.01 0,-1.4 -0.39,-0.39 -1.01,-0.39 -1.4,0L9,16.2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_twotone_delete_24.xml b/app/src/main/res/drawable/ic_twotone_delete_24.xml
deleted file mode 100644
index b77afdc9..00000000
--- a/app/src/main/res/drawable/ic_twotone_delete_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8,9h8v10H8z"
-      android:strokeAlpha="0.3"
-      android:fillAlpha="0.3"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M15.5,4l-1,-1h-5l-1,1H5v2h14V4zM6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM8,9h8v10H8V9z"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_authentication.xml b/app/src/main/res/layout/activity_authentication.xml
deleted file mode 100644
index 15f78de2..00000000
--- a/app/src/main/res/layout/activity_authentication.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.auth.AuthenticationActivity">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="40dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/btnRetry"
-        app:srcCompat="@drawable/ic_undraw_unlock_24mb"
-        android:adjustViewBounds="true"
-        android:id="@+id/illustrator"/>
-
-    <com.google.android.material.button.MaterialButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/illustrator"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:id="@+id/btnRetry"
-        android:text="Enter to KeyPass"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml
index 367042f3..8657eb0b 100644
--- a/app/src/main/res/layout/activity_crash.xml
+++ b/app/src/main/res/layout/activity_crash.xml
@@ -1,46 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.CrashActivity">
 
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.CrashActivity">
-
-        <ScrollView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:padding="@dimen/grid_4"
-            app:layout_constraintBottom_toTopOf="@id/btnSendFeedback">
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:padding="@dimen/grid_4"
+        app:layout_constraintBottom_toTopOf="@id/btnSendFeedback"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textview.MaterialTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constrainedWidth="true"
-            tools:text="@tools:sample/lorem/random"
             android:id="@+id/txtCrash"
-            app:layout_constrainedHeight="true"/>
-
-        </ScrollView>
-
-
-
-        <com.google.android.material.button.MaterialButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/btnSendFeedback"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/send_feedback"/>
+            app:layout_constrainedHeight="true"
+            app:layout_constrainedWidth="true"
+            tools:text="@tools:sample/lorem/random" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+    </ScrollView>
+
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnSendFeedback"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/send_feedback"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_scanner.xml b/app/src/main/res/layout/activity_scanner.xml
deleted file mode 100644
index 69c4b788..00000000
--- a/app/src/main/res/layout/activity_scanner.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.addTOTP.ScannerActivity">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:id="@+id/toolbar"
-            app:navigationIcon="@drawable/ic_baseline_arrow_back_ios_24"
-            app:title="@string/scanner"/>
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/backup_activity.xml b/app/src/main/res/layout/backup_activity.xml
deleted file mode 100644
index 10af8e65..00000000
--- a/app/src/main/res/layout/backup_activity.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<layout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_baseline_arrow_back_ios_24"
-            app:title="@string/credentials_backups" />
-
-        <FrameLayout
-            android:id="@+id/settings"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bottom_nav_drawer.xml b/app/src/main/res/layout/fragment_bottom_nav_drawer.xml
deleted file mode 100644
index 589a9b93..00000000
--- a/app/src/main/res/layout/fragment_bottom_nav_drawer.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <View
-            android:id="@+id/scrim_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            android:alpha="0"
-            android:background="?attr/scrimBackground"/>
-
-
-            <!--Container to act as the drawer's foreground container and hold all navigation-->
-            <FrameLayout
-                app:behavior_hideable="true"
-                app:behavior_skipCollapsed="true"
-                app:behavior_halfExpandedRatio="0.6"
-                android:id="@+id/foreground_container"
-                android:layout_width="match_parent"
-                app:layout_behavior="@string/bottom_sheet_behavior"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="@dimen/grid_4">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/nav_recycler_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="@dimen/grid_3"
-                    android:paddingBottom="@dimen/bottom_app_bar_height"
-                    android:clipToPadding="false"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                    android:orientation="vertical" />
-
-            </FrameLayout>
-
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/layout_backup_keypharse.xml b/app/src/main/res/layout/layout_backup_keypharse.xml
deleted file mode 100644
index f1371111..00000000
--- a/app/src/main/res/layout/layout_backup_keypharse.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <TextView
-        android:layout_marginTop="@dimen/grid_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:textSize="18sp"
-        android:textColor="@color/keypass_blue_600"
-        android:id="@+id/txtTitle"
-        android:text="@string/alert"/>
-
-    <TextView
-        android:layout_marginTop="@dimen/grid_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/txtTitle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginHorizontal="@dimen/grid_3"
-        app:layout_constrainedWidth="true"
-        android:gravity="center"
-        android:textColor="@color/keypass_blue_300"
-        android:textSize="14sp"
-        android:id="@+id/txtMessage"
-        android:text="@string/copy_keypharse_msg"/>
-
-    <TextView
-        android:layout_marginTop="@dimen/grid_2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:id="@+id/txtCode"
-        app:layout_constraintTop_toBottomOf="@id/txtMessage"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:textSize="18sp"
-        android:padding="@dimen/grid_1"
-        android:textColor="@color/keypass_blue_600"
-        tools:text="1234567890123456"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_custom_keypharse.xml b/app/src/main/res/layout/layout_custom_keypharse.xml
deleted file mode 100644
index 66387ff2..00000000
--- a/app/src/main/res/layout/layout_custom_keypharse.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/grid_2"
-        android:textSize="18sp"
-        android:textColor="@color/keypass_blue_600"
-        android:id="@+id/txtTitle"
-        android:text="@string/set_keyphrase"/>
-
-    <TextView
-        android:layout_marginTop="@dimen/grid_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/txtTitle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginHorizontal="@dimen/grid_3"
-        app:layout_constrainedWidth="true"
-        android:gravity="center"
-        android:textColor="@color/keypass_blue_300"
-        android:textSize="14sp"
-        android:id="@+id/txtMessage"
-        android:text="@string/set_keyphrase_info"/>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/txtMessage"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:id="@+id/tilKeyPhrase"
-        app:boxBackgroundMode="outline"
-        android:backgroundTint="@android:color/transparent"
-        app:boxBackgroundColor="@android:color/transparent"
-        android:layout_marginTop="@dimen/grid_2"
-        android:hint="@string/enter_keyphrase"
-        android:layout_marginHorizontal="@dimen/grid_3"
-        app:counterEnabled="true"
-        app:counterMaxLength="16">
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="1234"
-            android:id="@+id/etKeyPhrase"
-            android:textColor="@color/keypass_blue_600"/>
-    </com.google.android.material.textfield.TextInputLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_no_accounts.xml b/app/src/main/res/layout/layout_no_accounts.xml
deleted file mode 100644
index 75fb794e..00000000
--- a/app/src/main/res/layout/layout_no_accounts.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-    <data>
-        <variable
-            name="message"
-            type="String" />
-    </data>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/illustrator"
-        app:layout_constraintVertical_bias="0.7"
-        android:gravity="center"
-        android:text="@string/message_no_accounts"
-        app:layout_constrainedWidth="true"
-        style="@style/TextStyle.Heading"
-        android:layout_marginHorizontal="@dimen/grid_4"/>
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="match_parent"
-        android:id="@+id/illustrator"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:adjustViewBounds="true"
-        app:srcCompat="@drawable/ic_undraw_empty_street_sfxm"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_restore_keypharse.xml b/app/src/main/res/layout/layout_restore_keypharse.xml
deleted file mode 100644
index db6ae14b..00000000
--- a/app/src/main/res/layout/layout_restore_keypharse.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/grid_2"
-        android:textSize="18sp"
-        android:textColor="@color/keypass_blue_600"
-        android:id="@+id/txtTitle"
-        android:text="@string/restore"/>
-
-    <TextView
-        android:layout_marginTop="@dimen/grid_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/txtTitle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginHorizontal="@dimen/grid_3"
-        app:layout_constrainedWidth="true"
-        android:gravity="center"
-        android:textColor="@color/keypass_blue_300"
-        android:textSize="14sp"
-        android:id="@+id/txtMessage"
-        android:text="@string/keyphrase_restore_info"/>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/txtMessage"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:id="@+id/tilKeyPhrase"
-        app:boxBackgroundMode="outline"
-        android:backgroundTint="@android:color/transparent"
-        app:boxBackgroundColor="@android:color/transparent"
-        android:layout_marginTop="@dimen/grid_2"
-        android:hint="@string/enter_keyphrase"
-        android:layout_marginHorizontal="@dimen/grid_3"
-        app:counterEnabled="true"
-        app:counterMaxLength="16">
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="1234"
-            android:id="@+id/etKeyPhrase"
-            android:textColor="@color/keypass_blue_600"/>
-    </com.google.android.material.textfield.TextInputLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_delete.xml b/app/src/main/res/menu/menu_delete.xml
deleted file mode 100644
index 87db3e2c..00000000
--- a/app/src/main/res/menu/menu_delete.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_delete"
-        android:icon="@drawable/ic_twotone_delete_24"
-        android:title="@string/delete"/>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 973838a2..205eaad6 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -7,7 +7,6 @@
     <string name="copy_keypharse_msg">انسخ هذه العبارة الرئيسية التي سيتم استخدامها لاستعادة هذه النسخة الاحتياطية ، ولن يوفرها KeyPass مرة أخرى ، هل قمت بنسخها أو كتابتها؟</string>
     <string name="help">يساعد</string>
     <string name="security">حماية</string>
-    <string name="search">يبحث</string>
     <string name="account_name">إسم الحساب</string>
     <string name="username_email_phone">اسم المستخدم / البريد الإلكتروني / الهاتف</string>
     <string name="tags_comma_separated_optional">مفصولة بفواصل بين العلامات (اختياري)</string>
@@ -16,7 +15,6 @@
     <string name="auto_backup">نسخ إحتياطي آلي</string>
     <string name="enabled">ممكن</string>
     <string name="override_auto_backup_file">تجاوز ملف النسخ الاحتياطي التلقائي</string>
-    <string name="scanner">الماسح الضوئي</string>
     <string name="alert_black_secret_key">الرجاء إدخال مفتاح السر</string>
     <string name="scan_password">مسح كلمة المرور</string>
     <string name="custom_keyphrase">عبارة مفاتيح مخصصة</string>
@@ -57,7 +55,6 @@
     <string name="disabled">عاجز</string>
     <string name="alert_black_account_name">الرجاء إدخال اسم الحساب</string>
     <string name="add_totp">أضف TOTP</string>
-    <string name="save">يحفظ</string>
     <string name="enter_keyphrase">أدخل Keyphrase</string>
     <string name="restore">يعيد</string>
     <string name="incorrect_old_password">الرجاء إدخال كلمة المرور القديمة الصحيحة</string>
@@ -78,22 +75,13 @@
     <string name="send_feedback">ارسل رأيك</string>
     <string name="send_feedback_desc">الإبلاغ عن مشاكل فنية أو اقتراح ميزات جديدة</string>
     <string name="share">يشارك</string>
-    <string name="password_length">طول كلمة المرور</string>
-    <string name="uppercase_alphabets">الحروف الكبيرة</string>
-    <string name="lowercase_alphabets">الحروف الهجائية الصغيرة</string>
-    <string name="symbols">حرف او رمز</string>
-    <string name="numbers">أعداد</string>
     <string name="copied_to_clipboard">نسخ إلى الحافظة</string>
     <string name="login_to_enter_keypass">تسجيل الدخول للدخول KeyPass</string>
     <string name="last_backup_date">آخر نسخة احتياطية: %s</string>
-    <string name="coming_soon">قريباً</string>
     <string name="share_keypass">مشاركة KeyPass</string>
     <string name="message_no_accounts">لم يتم العثور على حسابات ، الرجاء الإضافة من الزر أدناه</string>
     <string name="turn_off_backup">قم بإيقاف تشغيل النسخ الاحتياطية</string>
-    <string name="verify_keyphrase">تحقق من عبارة المرور الاحتياطية</string>
-    <string name="verify_keyphrase_message">اختبر عبارة المرور الاحتياطية الخاصة بك وتحقق من مطابقتها</string>
     <string name="backup_folder">مجلد النسخ الاحتياطي</string>
-    <string name="backup">دعم</string>
     <string name="turn_on_backup">قم بتشغيل النسخ الاحتياطية</string>
     <string name="change_password_length">تغيير طول كلمة المرور</string>
     <string name="default_password_length">الطول الافتراضي لكلمة المرور</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index b11b1fc7..75c8e0d8 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="backup">ব্যাকআপ</string>
     <string name="turn_on_backup">ব্যাকআপ চালু করুন</string>
     <string name="yes">হ্যাঁ</string>
     <string name="alert_blank_keyphrase">অনুগ্রহ করে কীফ্রেজ লিখুন</string>
@@ -15,7 +14,6 @@
     <string name="send_feedback_desc">প্রযুক্তিগত সমস্যা রিপোর্ট বা নতুন বৈশিষ্ট্য প্রস্তাব</string>
     <string name="share">শেয়ার করুন</string>
     <string name="share_desc">অন্যদের সাথে অ্যাপ শেয়ার করুন</string>
-    <string name="password_length">পাসওয়ার্ড দৈর্ঘ্য</string>
     <string name="password">পাসওয়ার্ড</string>
     <string name="generate_password">পাসওয়ার্ড জেনারেট</string>
     <string name="home">বাড়ি</string>
@@ -24,14 +22,9 @@
     <string name="backup_restored">ব্যাকআপ পুনরুদ্ধার করা হয়েছে</string>
     <string name="invalid_keyphrase">অবৈধ কীফ্রেজ</string>
     <string name="backup_completed">ব্যাকআপ সম্পন্ন</string>
-    <string name="uppercase_alphabets">বড় হাতের বর্ণমালা</string>
-    <string name="lowercase_alphabets">ছোট হাতের বর্ণমালা</string>
-    <string name="symbols">প্রতীক</string>
-    <string name="numbers">সংখ্যা</string>
     <string name="copied_to_clipboard">ক্লিপবোর্ডে কপি করা হয়েছে</string>
     <string name="login_to_enter_keypass">কীপাসে প্রবেশ করতে লগইন করুন</string>
     <string name="last_backup_date">শেষ ব্যাকআপ: %s</string>
-    <string name="coming_soon">শীঘ্রই আসছে</string>
     <string name="delete_account_title">তুমি কি নিশ্চিত\?</string>
     <string name="delete_account_msg">আপনি কি সত্যিই এই এন্ট্রিটি মুছতে চান, এটি পুনরুদ্ধার করা যাবে না</string>
     <string name="cancel">বাতিল করুন</string>
@@ -39,8 +32,6 @@
     <string name="share_keypass">কীপাস শেয়ার করুন</string>
     <string name="message_no_accounts">কোন অ্যাকাউন্ট পাওয়া যায়নি, নীচের বোতাম থেকে যোগ করুন</string>
     <string name="turn_off_backup">ব্যাকআপ বন্ধ করুন</string>
-    <string name="verify_keyphrase">ব্যাকআপ পাসফ্রেজ যাচাই করুন</string>
-    <string name="verify_keyphrase_message">আপনার ব্যাকআপ পাসফ্রেজ পরীক্ষা করুন এবং যাচাই করুন যে এটি মেলে</string>
     <string name="backup_folder">ব্যাকআপ ফোল্ডার</string>
     <string name="backup_desc">ব্যাকআপগুলি একটি পাসফ্রেজ দিয়ে এনক্রিপ্ট করা হয় এবং আপনার ডিভাইসে সংরক্ষণ করা হয়</string>
     <string name="create_backup">ব্যাকআপ তৈরি</string>
@@ -48,7 +39,6 @@
     <string name="copy_keypharse_msg">এই মূল বাক্যাংশটি অনুলিপি করুন এই ব্যাকআপটি পুনরুদ্ধার করতে এটি ব্যবহার করা হবে, এটি আবার কীপাস দ্বারা সরবরাহ করা হবে না, আপনি কি অনুলিপি করেছেন বা লিখে রেখেছেন\?</string>
     <string name="help">সাহায্য</string>
     <string name="security">নিরাপত্তা</string>
-    <string name="search">অনুসন্ধান করুন</string>
     <string name="account_name">হিসাবের নাম</string>
     <string name="username_email_phone">ব্যবহারকারীর নাম/ইমেল/ফোন</string>
     <string name="tags_comma_separated_optional">ট্যাগ কমা আলাদা (ঐচ্ছিক)</string>
@@ -58,12 +48,10 @@
     <string name="disabled">অক্ষম</string>
     <string name="enabled">সক্রিয়</string>
     <string name="override_auto_backup_file">অটো ব্যাকআপ ফাইল ওভাররাইড করুন</string>
-    <string name="scanner">স্ক্যানার</string>
     <string name="alert_black_secret_key">গোপন কী লিখুন দয়া করে</string>
     <string name="alert_black_account_name">অনুগ্রহ করে অ্যাকাউন্টের নাম লিখুন</string>
     <string name="add_totp">TOTP যোগ করুন</string>
     <string name="scan_password">পাসওয়ার্ড স্ক্যান করুন</string>
-    <string name="save">সংরক্ষণ</string>
     <string name="custom_keyphrase">কাস্টম কীফ্রেজ</string>
     <string name="generate_keyphrase">কীফ্রেজ তৈরি করুন</string>
     <string name="set_keyphrase_info">অনুগ্রহ করে আপনার ব্যাকআপ ফাইলের জন্য কীফ্রেজ তৈরি করুন, এটি ব্যাকআপ ফাইল পুনরুদ্ধার করতে ব্যবহার করা হবে। মূল বাক্যাংশ 16টি অক্ষরের হওয়া উচিত</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dee307ef..64094cbb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -11,22 +11,15 @@
     <string name="restore_credentials">Anmeldeinformationen wiederherstellen</string>
     <string name="restore_credentials_desc">Stellen Sie Ihr Backup wieder her</string>
     <string name="send_feedback_desc">Melden Sie technische Probleme oder schlagen Sie neue Funktionen vor</string>
-    <string name="uppercase_alphabets">GROSSBUCHSTABEN</string>
-    <string name="lowercase_alphabets">Kleinbuchstaben</string>
-    <string name="symbols">Symbole</string>
-    <string name="numbers">Zahlen</string>
     <string name="invalid_keyphrase">Ungültige Schlüsselphrase</string>
     <string name="backup_completed">Sicherung abgeschlossen</string>
     <string name="credentials_backups_desc">Anmeldeinformationen im externen Speicher sichern</string>
     <string name="share">Aktie</string>
     <string name="share_desc">Teilen Sie die App mit anderen</string>
-    <string name="password_length">Passwortlänge</string>
     <string name="last_backup_date">Letzte Sicherung: %s</string>
-    <string name="coming_soon">Demnächst</string>
     <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
     <string name="login_to_enter_keypass">Melden Sie sich an, um KeyPass zu betreten</string>
     <string name="delete_account_title">Bist du dir sicher\?</string>
-    <string name="scanner">Scanner</string>
     <string name="alert_black_secret_key">Bitte geben Sie den geheimen Schlüssel ein</string>
     <string name="delete_account_msg">Möchten Sie diesen Eintrag wirklich löschen\? Er kann nicht wiederhergestellt werden</string>
     <string name="cancel">Stornieren</string>
@@ -34,10 +27,7 @@
     <string name="share_keypass">Teilen Sie KeyPass</string>
     <string name="message_no_accounts">Keine Konten gefunden, bitte über die Schaltfläche unten hinzufügen</string>
     <string name="turn_off_backup">Schalten Sie Backups aus</string>
-    <string name="verify_keyphrase">Überprüfen Sie die Backup-Passphrase</string>
-    <string name="verify_keyphrase_message">Testen Sie Ihre Backup-Passphrase und stellen Sie sicher, dass sie übereinstimmt</string>
     <string name="backup_folder">Sicherungsordner</string>
-    <string name="backup">Sicherung</string>
     <string name="turn_on_backup">Aktivieren Sie Backups</string>
     <string name="backup_desc">Backups werden mit einer Passphrase verschlüsselt und auf Ihrem Gerät gespeichert</string>
     <string name="yes">Ja</string>
@@ -46,7 +36,6 @@
     <string name="copy_keypharse_msg">Kopieren Sie diesen Schlüsselsatz. Dieser wird zur Wiederherstellung dieses Backups verwendet. Dieser wird nicht von KeyPass bereitgestellt. Haben Sie ihn noch einmal kopiert oder aufgeschrieben\?</string>
     <string name="help">Hilfe</string>
     <string name="security">Sicherheit</string>
-    <string name="search">Suchen</string>
     <string name="account_name">Kontobezeichnung</string>
     <string name="username_email_phone">Benutzername/E-Mail/Telefon</string>
     <string name="tags_comma_separated_optional">Tags durch Komma getrennt (optional)</string>
@@ -78,7 +67,6 @@
     <string name="override_auto_backup_file">Automatische Sicherungsdatei überschreiben</string>
     <string name="alert_black_account_name">Bitte geben Sie den Kontonamen ein</string>
     <string name="password_no_match">Das Passwort stimmte nicht überein</string>
-    <string name="save">Speichern</string>
     <string name="custom_keyphrase">Benutzerdefinierte Schlüsselphrase</string>
     <string name="alert_blank_keyphrase">Bitte Schlüsselwort eingeben</string>
     <string name="generate_keyphrase">Schlüsselwort generieren</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bbd74361..21d27747 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="disabled">Deshabilitado</string>
     <string name="enabled">Habilitado</string>
-    <string name="save">Salvar</string>
     <string name="str_continue">Continuar</string>
     <string name="home">Hogar</string>
     <string name="backup_restored">Copia de seguridad restaurada</string>
@@ -13,29 +12,23 @@
     <string name="send_feedback_desc">Informar de problemas técnicos o sugerir nuevas funciones</string>
     <string name="share_desc">Compartir aplicación con otros usuarios</string>
     <string name="password">Contraseña</string>
-    <string name="uppercase_alphabets">ALFABETOS MAYÚSCULAS</string>
     <string name="cancel">Cancelar</string>
     <string name="backup_folder">Carpeta de copia de seguridad</string>
     <string name="help">Ayuda</string>
     <string name="website_url_optional">URL del sitio web (opcional)</string>
     <string name="notes_optional">Notas (opcional)</string>
     <string name="auto_backup">Copia de seguridad automática</string>
-    <string name="scanner">Escáner</string>
     <string name="alert_black_account_name">Introduzca el nombre de la cuenta</string>
     <string name="descending">Descendente</string>
     <string name="send_feedback">Enviar comentarios</string>
     <string name="copied_to_clipboard">Copiado al portapapeles</string>
     <string name="login_to_enter_keypass">Inicie sesión para ingresar a KeyPass</string>
     <string name="last_backup_date">Última copia de seguridad: %s</string>
-    <string name="coming_soon">Próximamente</string>
     <string name="delete_account_title">¿Estás seguro\?</string>
     <string name="delete_account_msg">¿Realmente desea eliminar esta entrada, no se puede restaurar</string>
     <string name="share_keypass">Compartir KeyPass</string>
     <string name="message_no_accounts">No se encontraron cuentas, agregue desde el botón de abajo</string>
     <string name="turn_off_backup">Desactivar copias de seguridad</string>
-    <string name="verify_keyphrase">Verificar la contraseña de copia de seguridad</string>
-    <string name="verify_keyphrase_message">Pruebe su contraseña de copia de seguridad y verifique que coincida</string>
-    <string name="backup">Copia de seguridad</string>
     <string name="backup_desc">Las copias de seguridad se cifran con una frase de contraseña y se almacenan en su dispositivo</string>
     <string name="copy_keypharse_msg">Copiar esta frase clave esto se utilizará para recuperar esta copia de seguridad, esto no será proporcionado por KeyPass de nuevo, ¿ha copiado o escrito\?</string>
     <string name="security">Seguridad</string>
@@ -78,14 +71,9 @@
     <string name="generate_password">Generar contraseña</string>
     <string name="delete">Borrar</string>
     <string name="generate_shortcut_short_label">Generar contraseña</string>
-    <string name="lowercase_alphabets">Alfabetos en minúsculas</string>
     <string name="invalid_keyphrase">Frase clave no válida</string>
     <string name="restore_credentials">Restaurar credenciales</string>
     <string name="share">Compartir</string>
-    <string name="password_length">Longitud de la contraseña</string>
-    <string name="symbols">Símbolos</string>
-    <string name="numbers">Números</string>
-    <string name="search">Buscar</string>
     <string name="username_email_phone">Nombre de usuario/correo electrónico/teléfono</string>
     <string name="generate_keyphrase">Generar frase clave</string>
     <string name="alert_blank_keyphrase">Por favor, introduzca la frase clave</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 42bbeb5b..3cf09383 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -17,26 +17,17 @@
     <string name="send_feedback_desc">Signaler des problèmes techniques ou suggérer de nouvelles fonctionnalités</string>
     <string name="share">Partager</string>
     <string name="share_desc">Partager l\'application avec d\'autres</string>
-    <string name="password_length">Longueur du mot de passe</string>
     <string name="password">Mot de passe</string>
-    <string name="uppercase_alphabets">ALPHABETS MAJUSCULES</string>
-    <string name="lowercase_alphabets">alphabets minuscules</string>
-    <string name="symbols">Symboles</string>
-    <string name="numbers">Nombres</string>
     <string name="copied_to_clipboard">Copié dans le presse-papier</string>
     <string name="login_to_enter_keypass">Connectez-vous pour entrer KeyPass</string>
     <string name="last_backup_date">Dernière sauvegarde : %s</string>
-    <string name="coming_soon">À venir</string>
     <string name="delete_account_msg">Voulez-vous vraiment supprimer cette entrée, elle ne peut pas être restaurée</string>
     <string name="cancel">Annuler</string>
     <string name="feedback_to_keypass">Commentaires sur KeyPass</string>
     <string name="share_keypass">Partager KeyPass</string>
     <string name="message_no_accounts">Aucun compte trouvé, veuillez ajouter à partir du bouton ci-dessous</string>
     <string name="turn_off_backup">Désactiver les sauvegardes</string>
-    <string name="verify_keyphrase">Vérifier la phrase secrète de sauvegarde</string>
-    <string name="verify_keyphrase_message">Testez votre phrase secrète de secours et vérifiez qu\'elle correspond</string>
     <string name="backup_folder">Dossier de sauvegarde</string>
-    <string name="backup">Sauvegarde</string>
     <string name="turn_on_backup">Activer les sauvegardes</string>
     <string name="backup_desc">Les sauvegardes sont cryptées avec une phrase de passe et stockées sur votre appareil</string>
     <string name="yes">Oui</string>
@@ -45,7 +36,6 @@
     <string name="copy_keypharse_msg">Copiez cette phrase clé qui sera utilisée pour récupérer cette sauvegarde, elle ne sera pas fournie par KeyPass Encore une fois, avez-vous copié ou noté \?</string>
     <string name="help">Aider</string>
     <string name="security">Sécurité</string>
-    <string name="search">Recherche</string>
     <string name="account_name">Nom du compte</string>
     <string name="username_email_phone">Nom d\'utilisateur/Email/Téléphone</string>
     <string name="tags_comma_separated_optional">Balises séparées par des virgules (facultatif)</string>
@@ -53,12 +43,10 @@
     <string name="disabled">Désactivé</string>
     <string name="enabled">Activé</string>
     <string name="override_auto_backup_file">Remplacer le fichier de sauvegarde automatique</string>
-    <string name="scanner">Scanner</string>
     <string name="alert_black_secret_key">Veuillez entrer la clé secrète</string>
     <string name="alert_black_account_name">Veuillez entrer le nom du compte</string>
     <string name="add_totp">Ajouter TOTP</string>
     <string name="scan_password">Numériser le mot de passe</string>
-    <string name="save">Sauvegarder</string>
     <string name="custom_keyphrase">Phrase clé personnalisée</string>
     <string name="generate_keyphrase">Générer une phrase clé</string>
     <string name="alert_blank_keyphrase">Veuillez entrer la phrase clé</string>
diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml
index 7cd3ee9b..7fb6bc90 100644
--- a/app/src/main/res/values-gu-rIN/strings.xml
+++ b/app/src/main/res/values-gu-rIN/strings.xml
@@ -12,20 +12,13 @@
     <string name="restore_credentials">ઓળખપત્ર પુનઃસ્થાપિત કરો</string>
     <string name="restore_credentials_desc">તમારું બેકઅપ પુનઃસ્થાપિત કરો</string>
     <string name="share">શેર કરો</string>
-    <string name="scanner">સ્કેનર</string>
     <string name="send_feedback">પ્રતિસાદ મોકલ</string>
     <string name="send_feedback_desc">તકનીકી સમસ્યાઓની જાણ કરો અથવા નવી સુવિધાઓ સૂચવો</string>
     <string name="share_desc">અન્ય લોકો સાથે એપ્લિકેશન શેર કરો</string>
-    <string name="password_length">પાસવર્ડ લંબાઈ</string>
     <string name="password">પાસવર્ડ</string>
-    <string name="uppercase_alphabets">અપરકેસ આલ્ફાબેટ્સ</string>
-    <string name="lowercase_alphabets">લોઅરકેસ મૂળાક્ષરો</string>
-    <string name="symbols">પ્રતીકો</string>
-    <string name="numbers">સંખ્યાઓ</string>
     <string name="copied_to_clipboard">ક્લિપબોર્ડ પર કૉપિ કરી</string>
     <string name="login_to_enter_keypass">કીપાસ દાખલ કરવા માટે લોગિન કરો</string>
     <string name="last_backup_date">છેલ્લું બેકઅપ : %s</string>
-    <string name="coming_soon">ટૂક સમયમાં આવી રહ્યું છે</string>
     <string name="delete_account_title">શું તમને ખાતરી છે\?</string>
     <string name="delete_account_msg">શું તમે ખરેખર આ એન્ટ્રી કાઢી નાખવા માંગો છો, તે પુનઃસ્થાપિત કરી શકાતી નથી</string>
     <string name="cancel">રદ કરો</string>
@@ -33,10 +26,7 @@
     <string name="share_keypass">કીપાસ શેર કરો</string>
     <string name="message_no_accounts">કોઈ એકાઉન્ટ મળ્યું નથી, કૃપા કરીને નીચેના બટનમાંથી ઉમેરો</string>
     <string name="turn_off_backup">બેકઅપ્સ બંધ કરો</string>
-    <string name="verify_keyphrase">બેકઅપ પાસફ્રેઝ ચકાસો</string>
-    <string name="verify_keyphrase_message">તમારા બેકઅપ પાસફ્રેઝનું પરીક્ષણ કરો અને ચકાસો કે તે મેળ ખાય છે</string>
     <string name="backup_folder">બેકઅપ ફોલ્ડર</string>
-    <string name="backup">બેકઅપ</string>
     <string name="turn_on_backup">બેકઅપ ચાલુ કરો</string>
     <string name="backup_desc">બેકઅપ્સ પાસફ્રેઝ સાથે એન્ક્રિપ્ટેડ છે અને તમારા ઉપકરણ પર સંગ્રહિત છે</string>
     <string name="yes">હા</string>
@@ -45,7 +35,6 @@
     <string name="copy_keypharse_msg">આ મુખ્ય શબ્દસમૂહની નકલ કરો આનો ઉપયોગ આ બેકઅપને પુનઃપ્રાપ્ત કરવા માટે કરવામાં આવશે, આ ફરીથી કીપાસ દ્વારા પ્રદાન કરવામાં આવશે નહીં, શું તમે નકલ કરી છે કે લખી છે\?</string>
     <string name="help">મદદ</string>
     <string name="security">સુરક્ષા</string>
-    <string name="search">શોધો</string>
     <string name="account_name">ખાતાનું નામ</string>
     <string name="username_email_phone">વપરાશકર્તા નામ/ઈમેલ/ફોન</string>
     <string name="tags_comma_separated_optional">ટૅગ્સ અલ્પવિરામથી અલગ (વૈકલ્પિક)</string>
@@ -59,7 +48,6 @@
     <string name="alert_black_account_name">કૃપા કરીને એકાઉન્ટનું નામ દાખલ કરો</string>
     <string name="add_totp">TOTP ઉમેરો</string>
     <string name="scan_password">પાસવર્ડ સ્કેન કરો</string>
-    <string name="save">સાચવો</string>
     <string name="custom_keyphrase">કસ્ટમ કીફ્રેઝ</string>
     <string name="generate_keyphrase">કીફ્રેઝ જનરેટ કરો</string>
     <string name="alert_blank_keyphrase">કૃપા કરીને કીફ્રેઝ દાખલ કરો</string>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index 49431349..c357f1aa 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -5,7 +5,6 @@
     <string name="delete">કાઢી નાખો</string>
     <string name="add_totp">TOTP ઉમેરો</string>
     <string name="scan_password">પાસવર્ડ સ્કેન કરો</string>
-    <string name="save">સાચવો</string>
     <string name="custom_keyphrase">કસ્ટમ કીફ્રેઝ</string>
     <string name="generate_keyphrase">કીફ્રેઝ જનરેટ કરો</string>
     <string name="change_app_password">એપનો પાસવર્ડ બદલો</string>
@@ -24,16 +23,10 @@
     <string name="send_feedback_desc">તકનીકી સમસ્યાઓની જાણ કરો અથવા નવી સુવિધાઓ સૂચવો</string>
     <string name="share">શેર કરો</string>
     <string name="share_desc">અન્ય લોકો સાથે એપ્લિકેશન શેર કરો</string>
-    <string name="password_length">પાસવર્ડ લંબાઈ</string>
     <string name="password">પાસવર્ડ</string>
-    <string name="uppercase_alphabets">અપરકેસ આલ્ફાબેટ્સ</string>
-    <string name="lowercase_alphabets">લોઅરકેસ મૂળાક્ષરો</string>
-    <string name="symbols">પ્રતીકો</string>
-    <string name="numbers">સંખ્યાઓ</string>
     <string name="copied_to_clipboard">ક્લિપબોર્ડ પર કૉપિ કરી</string>
     <string name="login_to_enter_keypass">કીપાસ દાખલ કરવા માટે લોગિન કરો</string>
     <string name="last_backup_date">છેલ્લું બેકઅપ : %s</string>
-    <string name="coming_soon">ટૂક સમયમાં આવી રહ્યું છે</string>
     <string name="delete_account_title">શું તમને ખાતરી છે\?</string>
     <string name="delete_account_msg">શું તમે ખરેખર આ એન્ટ્રી કાઢી નાખવા માંગો છો, તે પુનઃસ્થાપિત કરી શકાતી નથી</string>
     <string name="cancel">રદ કરો</string>
@@ -41,10 +34,7 @@
     <string name="share_keypass">કીપાસ શેર કરો</string>
     <string name="message_no_accounts">કોઈ એકાઉન્ટ મળ્યું નથી, કૃપા કરીને નીચેના બટનમાંથી ઉમેરો</string>
     <string name="turn_off_backup">બેકઅપ્સ બંધ કરો</string>
-    <string name="verify_keyphrase">બેકઅપ પાસફ્રેઝ ચકાસો</string>
-    <string name="verify_keyphrase_message">તમારા બેકઅપ પાસફ્રેઝનું પરીક્ષણ કરો અને ચકાસો કે તે મેળ ખાય છે</string>
     <string name="backup_folder">બેકઅપ ફોલ્ડર</string>
-    <string name="backup">બેકઅપ</string>
     <string name="turn_on_backup">બેકઅપ ચાલુ કરો</string>
     <string name="backup_desc">બેકઅપ્સ પાસફ્રેઝ સાથે એન્ક્રિપ્ટેડ છે અને તમારા ઉપકરણ પર સંગ્રહિત છે</string>
     <string name="yes">હા</string>
@@ -53,7 +43,6 @@
     <string name="copy_keypharse_msg">આ મુખ્ય શબ્દસમૂહની નકલ કરો આનો ઉપયોગ આ બેકઅપને પુનઃપ્રાપ્ત કરવા માટે કરવામાં આવશે, આ ફરીથી કીપાસ દ્વારા પ્રદાન કરવામાં આવશે નહીં, શું તમે નકલ કરી છે કે લખી છે\?</string>
     <string name="help">મદદ</string>
     <string name="security">સુરક્ષા</string>
-    <string name="search">શોધો</string>
     <string name="account_name">ખાતાનું નામ</string>
     <string name="username_email_phone">વપરાશકર્તા નામ/ઈમેલ/ફોન</string>
     <string name="tags_comma_separated_optional">ટૅગ્સ અલ્પવિરામથી અલગ (વૈકલ્પિક)</string>
@@ -63,7 +52,6 @@
     <string name="disabled">અક્ષમ</string>
     <string name="enabled">સક્ષમ</string>
     <string name="override_auto_backup_file">ઑટો બેકઅપ ફાઇલને ઓવરરાઇડ કરો</string>
-    <string name="scanner">સ્કેનર</string>
     <string name="alert_black_secret_key">કૃપા કરીને ગુપ્ત કી દાખલ કરો</string>
     <string name="alert_black_account_name">કૃપા કરીને એકાઉન્ટનું નામ દાખલ કરો</string>
     <string name="alert_blank_keyphrase">કૃપા કરીને કીફ્રેઝ દાખલ કરો</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 1a4d218c..803d9952 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -16,12 +16,7 @@
     <string name="send_feedback_desc">तकनीकी मुद्दों की रिपोर्ट करें या नई सुविधाओं का सुझाव दें</string>
     <string name="share">साझा करें</string>
     <string name="share_desc">दूसरों के साथ ऐप शेयर करें</string>
-    <string name="password_length">पासवर्ड की लंबाई</string>
     <string name="password">पासवर्ड</string>
-    <string name="uppercase_alphabets">अपरकेस अक्षर</string>
-    <string name="lowercase_alphabets">लोअरकेस अक्षर</string>
-    <string name="symbols">प्रतीक</string>
-    <string name="numbers">संख्याएं</string>
     <string name="copied_to_clipboard">क्लिपबोर्ड पर कॉपी किया गया</string>
     <string name="login_to_enter_keypass">KeyPass में प्रवेश करने के लिए लॉगिन करें</string>
     <string name="biometric_error_no_hardware">इस डिवाइस पर कोई बायोमेट्रिक सुविधा उपलब्ध नहीं है।</string>
@@ -31,7 +26,6 @@
     <string name="password_set_from_settings">कृपया फोन सेटिंग से पहले अपने डिवाइस के लिए पासवर्ड सेट करें</string>
     <string name="authentication_failed">प्रमाणीकरण विफल होना</string>
     <string name="last_backup_date">पिछला बैकअप: %s</string>
-    <string name="coming_soon">जल्द आ रहा है</string>
     <string name="delete_account_title">क्या आप वाकई ऐसा करना चाहते हैं\?</string>
     <string name="delete_account_msg">क्या आप वास्तव में इस प्रविष्टि को हटाना चाहते हैं, इसे बहाल नहीं किया जा सकता</string>
     <string name="cancel">रद्द करें</string>
@@ -39,10 +33,7 @@
     <string name="share_keypass">शेयर KeyPass</string>
     <string name="message_no_accounts">कोई खाता नहीं जोड़ा गया, कृपया नीचे बटन से जोड़ें</string>
     <string name="turn_off_backup">बैकअप बंद करें</string>
-    <string name="verify_keyphrase">बैकअप पासफ़्रेज़ सत्यापित करें</string>
-    <string name="verify_keyphrase_message">अपने बैकअप पासफ्रेज़ का परीक्षण करें और सत्यापित करें कि यह मेल खाता है</string>
     <string name="backup_folder">बैकअप फोल्डर</string>
-    <string name="backup">बैकअप</string>
     <string name="turn_on_backup">बैकअप चालू करें</string>
     <string name="backup_desc">बैकअप पासफ़्रेज़ के साथ एन्क्रिप्ट किए जाते हैं और आपके डिवाइस पर संग्रहीत होते हैं</string>
     <string name="yes">हाँ</string>
@@ -51,7 +42,6 @@
     <string name="copy_keypharse_msg">इस कुंजी वाक्यांश को कॉपी करें इसका उपयोग इस बैकअप को पुनर्प्राप्त करने के लिए किया जाएगा, यह KeyPass अगेन द्वारा प्रदान नहीं किया जाएगा, क्या आपने कॉपी किया है या लिखा है\?</string>
     <string name="help">मदद</string>
     <string name="security">सुरक्षा</string>
-    <string name="search">खोजें</string>
     <string name="account_name">खाता नाम</string>
     <string name="username_email_phone">प्रयोक्ता नाम/ईमेल/फोन</string>
     <string name="tags_comma_separated_optional">टैग अल्पविराम से अलग (वैकल्पिक)</string>
@@ -61,12 +51,10 @@
     <string name="disabled">अक्षम</string>
     <string name="enabled">सक्रिय</string>
     <string name="override_auto_backup_file">ऑटो बैकअप फ़ाइल को ओवरराइड करें</string>
-    <string name="scanner">स्कैनर</string>
     <string name="alert_black_secret_key">कृपया गुप्त कुंजी दर्ज करें</string>
     <string name="alert_black_account_name">कृपया खाता नाम दर्ज करें</string>
     <string name="add_totp">TOTP . जोड़ें</string>
     <string name="scan_password">पासवर्ड स्कैन करें</string>
-    <string name="save">सहेजें</string>
     <string name="custom_keyphrase">कस्टम कीफ़्रेज़</string>
     <string name="generate_keyphrase">कीफ़्रेज़ जनरेट करें</string>
     <string name="alert_blank_keyphrase">कृपया कीफ़्रेज़ दर्ज करें</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9c2b46b5..7bce13a6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -16,16 +16,10 @@
     <string name="send_feedback_desc">Segnala problemi tecnici o suggerisci nuove funzionalità</string>
     <string name="share">Condividi</string>
     <string name="share_desc">Condividi app con altri</string>
-    <string name="password_length">Lunghezza della password</string>
     <string name="password">Password</string>
-    <string name="uppercase_alphabets">AIUTI DI SUPERCASE</string>
-    <string name="lowercase_alphabets">alfabeti inferiori</string>
-    <string name="symbols">Simboli</string>
-    <string name="numbers">Numeri</string>
     <string name="copied_to_clipboard">Copied a clipboard</string>
     <string name="login_to_enter_keypass">Accedi per inserire KeyPass</string>
     <string name="last_backup_date">Ultimo backup: %s</string>
-    <string name="coming_soon">Arrivo presto</string>
     <string name="delete_account_title">Sei sicuro\?</string>
     <string name="delete_account_msg">Vuoi davvero eliminare questa voce, non può essere ripristinato</string>
     <string name="cancel">Annulla</string>
@@ -33,10 +27,7 @@
     <string name="share_keypass">Condividi KeyPass</string>
     <string name="message_no_accounts">Nessun Account trovato, si prega di aggiungere dal pulsante sottostante</string>
     <string name="turn_off_backup">Attivare i backup</string>
-    <string name="verify_keyphrase">Verificare passphrase di backup</string>
-    <string name="verify_keyphrase_message">Testare il passphrase di backup e verificare che corrisponda</string>
     <string name="backup_folder">Cartella di backup</string>
-    <string name="backup">Backup</string>
     <string name="turn_on_backup">Attivare i backup</string>
     <string name="backup_desc">I backup sono crittografati con un passphrase e memorizzati sul dispositivo</string>
     <string name="yes">Sì</string>
@@ -45,7 +36,6 @@
     <string name="copy_keypharse_msg">Copia Questo Key Phrase sarà utilizzato per recuperare questo backup, questo non sarà fornito da KeyPass Ancora una volta, hai copiato o scritto giù\?</string>
     <string name="help">Aiuto</string>
     <string name="security">Sicurezza</string>
-    <string name="search">Ricerca</string>
     <string name="account_name">Nome del conto</string>
     <string name="username_email_phone">Nome utente/Email/Phone</string>
     <string name="tags_comma_separated_optional">Tags virgola separata (opzionale)</string>
@@ -54,12 +44,10 @@
     <string name="auto_backup">Backup automatico</string>
     <string name="disabled">Disabili</string>
     <string name="enabled">Abilitato</string>
-    <string name="scanner">Scanner</string>
     <string name="alert_black_secret_key">Inserisci la chiave segreta</string>
     <string name="alert_black_account_name">Inserisci il nome dell\'account</string>
     <string name="add_totp">Aggiungere TOTP</string>
     <string name="scan_password">Scansione password</string>
-    <string name="save">Salva</string>
     <string name="custom_keyphrase">Tastiera personalizzata</string>
     <string name="generate_keyphrase">Generare Keyphrase</string>
     <string name="alert_blank_keyphrase">Si prega di inserire keyphrase</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4a09b450..3cc7512d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -6,13 +6,9 @@
     <string name="restore_credentials">認証情報の復元</string>
     <string name="restore_credentials_desc">バックアップを復元する</string>
     <string name="send_feedback">フィードバックを送信する</string>
-    <string name="lowercase_alphabets">小文字のアルファベット</string>
-    <string name="symbols">記号</string>
-    <string name="numbers">数字</string>
     <string name="copied_to_clipboard">クリップボードにコピーされました</string>
     <string name="login_to_enter_keypass">ログインしてKeyPassを入力してください</string>
     <string name="last_backup_date">最終バックアップ: %s</string>
-    <string name="coming_soon">近日公開</string>
     <string name="delete_account_title">本気ですか？</string>
     <string name="delete_account_msg">本当にこのエントリを削除してもよろしいですか。復元できません</string>
     <string name="cancel">キャンセル</string>
@@ -20,10 +16,7 @@
     <string name="share_keypass">キーパスを共有する</string>
     <string name="message_no_accounts">アカウントが見つかりません。下のボタンから追加してください</string>
     <string name="turn_off_backup">バックアップをオフにする</string>
-    <string name="verify_keyphrase">バックアップのパスフレーズを確認する</string>
-    <string name="verify_keyphrase_message">バックアップ パスフレーズをテストし、一致することを確認します</string>
     <string name="backup_folder">バックアップフォルダー</string>
-    <string name="backup">バックアップ</string>
     <string name="turn_on_backup">バックアップをオンにする</string>
     <string name="backup_desc">バックアップはパスフレーズで暗号化され、デバイスに保存されます</string>
     <string name="yes">はい</string>
@@ -32,7 +25,6 @@
     <string name="copy_keypharse_msg">このキー フレーズをコピーします。これはこのバックアップを回復するために使用されます。これは KeyPass によって提供されるものではありません。コピーまたは書き留めましたか\?</string>
     <string name="help">ヘルプ</string>
     <string name="security">安全</string>
-    <string name="search">検索</string>
     <string name="account_name">アカウント名</string>
     <string name="username_email_phone">ユーザー名/メールアドレス/電話番号</string>
     <string name="tags_comma_separated_optional">タグはカンマ区切り (オプション)</string>
@@ -42,12 +34,10 @@
     <string name="disabled">無効</string>
     <string name="enabled">有効</string>
     <string name="override_auto_backup_file">自動バックアップファイルを上書きする</string>
-    <string name="scanner">スキャナー</string>
     <string name="alert_black_secret_key">秘密キーを入力してください</string>
     <string name="alert_black_account_name">アカウント名を入力してください</string>
     <string name="add_totp">TOTPを追加</string>
     <string name="scan_password">スキャンパスワード</string>
-    <string name="save">保存</string>
     <string name="custom_keyphrase">カスタムキーフレーズ</string>
     <string name="generate_keyphrase">キーフレーズの生成</string>
     <string name="alert_blank_keyphrase">キーフレーズを入力してください</string>
@@ -92,9 +82,7 @@
     <string name="send_feedback_desc">技術的な問題を報告したり、新機能を提案したりする</string>
     <string name="share">共有</string>
     <string name="share_desc">アプリを他の人と共有する</string>
-    <string name="password_length">パスワードの長さ</string>
     <string name="password">パスワード</string>
-    <string name="uppercase_alphabets">大文字のアルファベット</string>
     <string name="change_password_length">パスワードの長さを変更する</string>
     <string name="default_password_length">デフォルトのパスワードの長さ</string>
     <string name="secret_key">秘密鍵</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 56986cb1..bef14765 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -20,24 +20,15 @@
     <string name="send_feedback_desc">तांत्रिक समस्यांची तक्रार करा किंवा नवीन वैशिष्ट्ये सुचवा</string>
     <string name="share">शेअर करा</string>
     <string name="share_desc">इतरांसह अॅप सामायिक करा</string>
-    <string name="password_length">पासवर्ड लांबी</string>
     <string name="password">पासवर्ड</string>
-    <string name="uppercase_alphabets">अप्परकेस अक्षरे</string>
-    <string name="lowercase_alphabets">लोअरकेस अक्षरे</string>
-    <string name="symbols">चिन्हे</string>
-    <string name="numbers">संख्या</string>
     <string name="copied_to_clipboard">क्लिपबोर्डवर कॉपी केले</string>
     <string name="login_to_enter_keypass">कीपास प्रविष्ट करण्यासाठी लॉग इन करा</string>
     <string name="last_backup_date">शेवटचा बॅकअप : %s</string>
-    <string name="coming_soon">लवकरच येत आहे</string>
     <string name="delete_account_title">तुला खात्री आहे\?</string>
     <string name="delete_account_msg">तुम्हाला ही एंट्री खरोखर हटवायची आहे का, ती पुनर्संचयित केली जाऊ शकत नाही</string>
     <string name="cancel">रद्द करा</string>
     <string name="message_no_accounts">कोणतीही खाती आढळली नाहीत, कृपया खालील बटणावरून जोडा</string>
-    <string name="verify_keyphrase">बॅकअप सांकेतिक वाक्यांश सत्यापित करा</string>
-    <string name="verify_keyphrase_message">तुमचा बॅकअप सांकेतिक वाक्यांश तपासा आणि ते जुळत असल्याचे सत्यापित करा</string>
     <string name="backup_folder">बॅकअप फोल्डर</string>
-    <string name="backup">बॅकअप</string>
     <string name="turn_on_backup">बॅकअप चालू करा</string>
     <string name="backup_desc">बॅकअप सांकेतिक वाक्यांशासह कूटबद्ध केले जातात आणि आपल्या डिव्हाइसवर संग्रहित केले जातात</string>
     <string name="yes">होय</string>
@@ -46,7 +37,6 @@
     <string name="copy_keypharse_msg">हा मुख्य वाक्यांश कॉपी करा हा बॅकअप पुनर्प्राप्त करण्यासाठी वापरला जाईल, हे पुन्हा कीपासद्वारे प्रदान केले जाणार नाही, तुम्ही कॉपी केले आहे किंवा लिहून ठेवले आहे का\?</string>
     <string name="help">मदत करा</string>
     <string name="security">सुरक्षा</string>
-    <string name="search">शोधा</string>
     <string name="account_name">खात्याचे नाव</string>
     <string name="username_email_phone">वापरकर्तानाव/ईमेल/फोन</string>
     <string name="tags_comma_separated_optional">टॅग स्वल्पविराम विभक्त (पर्यायी)</string>
@@ -56,12 +46,10 @@
     <string name="disabled">अक्षम</string>
     <string name="enabled">सक्षम केले</string>
     <string name="override_auto_backup_file">ऑटो बॅकअप फाइल ओव्हरराइड करा</string>
-    <string name="scanner">स्कॅनर</string>
     <string name="alert_black_secret_key">कृपया गुप्त की प्रविष्ट करा</string>
     <string name="alert_black_account_name">कृपया खाते नाव प्रविष्ट करा</string>
     <string name="add_totp">TOTP जोडा</string>
     <string name="scan_password">पासवर्ड स्कॅन करा</string>
-    <string name="save">जतन करा</string>
     <string name="custom_keyphrase">सानुकूल मुख्य वाक्यांश</string>
     <string name="generate_keyphrase">मुख्य वाक्यांश व्युत्पन्न करा</string>
     <string name="alert_blank_keyphrase">कृपया मुख्य वाक्यांश प्रविष्ट करा</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ea24a3d0..c6e1bd70 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -16,12 +16,7 @@
     <string name="send_feedback_desc">Reportar um problema técnico ou sugerir novas funções</string>
     <string name="share">Compartilhar</string>
     <string name="share_desc">Divulgar app com outros</string>
-    <string name="password_length">Comprimento da senha</string>
     <string name="password">Senha</string>
-    <string name="uppercase_alphabets">LETRAS MAIÚSCULAS</string>
-    <string name="lowercase_alphabets">letras minúsculas</string>
-    <string name="symbols">Símbolos</string>
-    <string name="numbers">Números</string>
     <string name="copied_to_clipboard">Copiado para à área de transferência</string>
     <string name="login_to_enter_keypass">Autenticação para entrar no KeyPass</string>
     <string name="biometric_error_no_hardware">Nenhum recurso biométrico disponível neste dispositivo.</string>
@@ -31,7 +26,6 @@
     <string name="password_set_from_settings">Por favor, defina a senha para o seu dispositivo primeiro nas configurações do telefone</string>
     <string name="authentication_failed">Falha na autenticação</string>
     <string name="last_backup_date">Último backup: %s</string>
-    <string name="coming_soon">Em breve</string>
     <string name="delete_account_title">Tem certeza\?</string>
     <string name="delete_account_msg">Você realmente deseja apagar esses dados\? Não será possível restaurá-los</string>
     <string name="cancel">Cancelar</string>
@@ -39,10 +33,7 @@
     <string name="share_keypass">Compartilhar o KeyPass</string>
     <string name="message_no_accounts">Nenhuma conta adicionada. Por favor, adicione uma através do botão abaixo</string>
     <string name="turn_off_backup">Desativar backups</string>
-    <string name="verify_keyphrase">Verificar senha do backup</string>
-    <string name="verify_keyphrase_message">Teste a senha do seu backup e verifique se ela está correta</string>
     <string name="backup_folder">Pasta de backup</string>
-    <string name="backup">Backup</string>
     <string name="turn_on_backup">Ativar backups</string>
     <string name="backup_desc">Os backups são criptografados com uma senha e armazenados no seu dispositivo</string>
     <string name="yes">Sim</string>
@@ -51,7 +42,6 @@
     <string name="copy_keypharse_msg">Copie essa senha. Ela será usada para restaurar esse backup. O KeyPass não irá exibi-la novamente. Você copiou ou guardou sua senha\?</string>
     <string name="help">Ajuda</string>
     <string name="security">Segurança</string>
-    <string name="search">Pesquisar</string>
     <string name="account_name">Nome da conta</string>
     <string name="username_email_phone">Usuário/E-mail/Telefone</string>
     <string name="tags_comma_separated_optional">Tags separadas por vírgula (opcional)</string>
@@ -61,12 +51,10 @@
     <string name="disabled">Desativado</string>
     <string name="enabled">Ativado</string>
     <string name="override_auto_backup_file">Sobrescrever o arquivo de backup automático</string>
-    <string name="scanner">Scanner</string>
     <string name="alert_black_secret_key">Por favor insira a chave secreta</string>
     <string name="alert_black_account_name">Por favor insira o nome da conta</string>
     <string name="add_totp">Adicionar TOTP</string>
     <string name="scan_password">Escanear senha</string>
-    <string name="save">Salvar</string>
     <string name="custom_keyphrase">Frase-chave personalizada</string>
     <string name="generate_keyphrase">Gerar frase-chave</string>
     <string name="alert_blank_keyphrase">Digite a frase-chave</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7fa28571..62d7da14 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -16,16 +16,10 @@
     <string name="send_feedback_desc">Сообщайте о технических проблемах или предлагайте новые функции</string>
     <string name="share">Делиться</string>
     <string name="share_desc">Поделитесь приложением с другими</string>
-    <string name="password_length">Длина пароля</string>
     <string name="password">Пароль</string>
-    <string name="uppercase_alphabets">АЛФАВИТЫ В ВЕРХНЕМ РЕГИСТРЕ</string>
-    <string name="lowercase_alphabets">алфавиты в нижнем регистре</string>
-    <string name="symbols">Символы</string>
-    <string name="numbers">Числа</string>
     <string name="copied_to_clipboard">Скопировано в буфер обмена</string>
     <string name="login_to_enter_keypass">Войдите в систему, чтобы ввести пароль</string>
     <string name="last_backup_date">Последняя резервная копия : %s</string>
-    <string name="coming_soon">Скоро будет</string>
     <string name="delete_account_title">Вы уверены\?</string>
     <string name="delete_account_msg">Вы действительно хотите удалить эту запись, она не может быть восстановлена</string>
     <string name="cancel">Отменить</string>
@@ -33,10 +27,7 @@
     <string name="share_keypass">Общий доступ к ключу</string>
     <string name="message_no_accounts">Учетные записи не найдены, пожалуйста, добавьте с помощью кнопки ниже</string>
     <string name="turn_off_backup">Отключите резервное копирование</string>
-    <string name="verify_keyphrase">Проверьте кодовую фразу резервного копирования</string>
-    <string name="verify_keyphrase_message">Проверьте свою резервную кодовую фразу и убедитесь, что она соответствует</string>
     <string name="backup_folder">Папка резервного копирования</string>
-    <string name="backup">Резервная копия</string>
     <string name="turn_on_backup">Включите резервное копирование</string>
     <string name="backup_desc">Резервные копии шифруются с помощью парольной фразы и хранятся на вашем устройстве</string>
     <string name="yes">Да</string>
@@ -45,7 +36,6 @@
     <string name="copy_keypharse_msg">Скопируйте эту ключевую фразу, это будет использовано для восстановления этой резервной копии, это больше не будет предоставляться KeyPass, вы скопировали или записали\?</string>
     <string name="help">Помощь</string>
     <string name="security">Безопасность</string>
-    <string name="search">Поиск</string>
     <string name="account_name">Имя учетной записи</string>
     <string name="username_email_phone">Имя пользователя/Электронная почта/Телефон</string>
     <string name="tags_comma_separated_optional">Теги, разделенные запятой (необязательно)</string>
@@ -55,12 +45,10 @@
     <string name="disabled">Нетрудоспособный</string>
     <string name="enabled">Включенный</string>
     <string name="override_auto_backup_file">Переопределить файл автоматической резервной копии</string>
-    <string name="scanner">Сканер</string>
     <string name="alert_black_secret_key">Пожалуйста, введите секретный ключ</string>
     <string name="alert_black_account_name">Пожалуйста, введите имя учетной записи</string>
     <string name="add_totp">Добавить TOTP</string>
     <string name="scan_password">Пароль для сканирования</string>
-    <string name="save">Сохранить</string>
     <string name="custom_keyphrase">Пользовательская ключевая фраза</string>
     <string name="generate_keyphrase">Сгенерировать ключевую фразу</string>
     <string name="alert_blank_keyphrase">Пожалуйста, введите ключевую фразу</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 0936b7b8..605079d0 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -28,16 +28,10 @@
     <string name="send_feedback">கருத்தினை அனுப்பவும்</string>
     <string name="send_feedback_desc">தொழில்நுட்பச் சிக்கல்களைப் புகாரளிக்கவும் அல்லது புதிய அம்சங்களைப் பரிந்துரைக்கவும்</string>
     <string name="share_desc">மற்றவர்களுடன் பயன்பாட்டைப் பகிரவும்</string>
-    <string name="password_length">கடவுச்சொல் நீளம்</string>
     <string name="password">கடவுச்சொல்</string>
-    <string name="uppercase_alphabets">பெரிய எழுத்துக்கள்</string>
-    <string name="lowercase_alphabets">சிறிய எழுத்துக்கள்</string>
-    <string name="symbols">சின்னங்கள்</string>
-    <string name="numbers">எண்கள்</string>
     <string name="copied_to_clipboard">கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது</string>
     <string name="login_to_enter_keypass">கீபாஸில் நுழைய உள்நுழைக</string>
     <string name="last_backup_date">கடைசி காப்புப்பிரதி : %s</string>
-    <string name="coming_soon">விரைவில்</string>
     <string name="delete_account_title">நீ சொல்வது உறுதியா\?</string>
     <string name="delete_account_msg">இந்த பதிவை நீக்க விரும்புகிறீர்களா, அதை மீட்டெடுக்க முடியாது</string>
     <string name="cancel">ரத்து செய்</string>
@@ -45,10 +39,7 @@
     <string name="share_keypass">கீபாஸைப் பகிரவும்</string>
     <string name="message_no_accounts">கணக்குகள் எதுவும் இல்லை, கீழே உள்ள பொத்தானில் இருந்து சேர்க்கவும்</string>
     <string name="turn_off_backup">காப்புப்பிரதிகளை முடக்கு</string>
-    <string name="verify_keyphrase">காப்பு கடவுச்சொற்றொடரை சரிபார்க்கவும்</string>
-    <string name="verify_keyphrase_message">உங்கள் காப்புப்பிரதி கடவுச்சொற்றொடரைச் சோதித்து, அது பொருந்துகிறதா என்பதைச் சரிபார்க்கவும்</string>
     <string name="backup_folder">காப்பு கோப்புறை</string>
-    <string name="backup">காப்புப்பிரதி</string>
     <string name="turn_on_backup">காப்புப்பிரதிகளை இயக்கவும்</string>
     <string name="backup_desc">காப்புப்பிரதிகள் கடவுச்சொற்றொடருடன் குறியாக்கம் செய்யப்பட்டு உங்கள் சாதனத்தில் சேமிக்கப்படும்</string>
     <string name="yes">ஆம்</string>
@@ -57,7 +48,6 @@
     <string name="copy_keypharse_msg">இந்த முக்கிய சொற்றொடரை நகலெடு இது இந்த காப்புப்பிரதியை மீட்டெடுக்கப் பயன்படும், இது மீண்டும் கீபாஸால் வழங்கப்படாது, நீங்கள் நகலெடுத்துள்ளீர்களா அல்லது எழுதியுள்ளீர்களா\?</string>
     <string name="help">உதவி</string>
     <string name="security">பாதுகாப்பு</string>
-    <string name="search">தேடு</string>
     <string name="account_name">கணக்கின் பெயர்</string>
     <string name="username_email_phone">பயனர்பெயர்/மின்னஞ்சல்/தொலைபேசி</string>
     <string name="tags_comma_separated_optional">குறிச்சொற்கள் கமா பிரிக்கப்பட்டது (விரும்பினால்)</string>
@@ -67,12 +57,10 @@
     <string name="disabled">முடக்கப்பட்டது</string>
     <string name="enabled">இயக்கப்பட்டது</string>
     <string name="override_auto_backup_file">தானியங்கு காப்புப் பிரதி கோப்பை மேலெழுதவும்</string>
-    <string name="scanner">ஸ்கேனர்</string>
     <string name="alert_black_secret_key">ரகசிய விசையை உள்ளிடவும்</string>
     <string name="alert_black_account_name">கணக்கு பெயரை உள்ளிடவும்</string>
     <string name="add_totp">TOTP ஐச் சேர்க்கவும்</string>
     <string name="scan_password">கடவுச்சொல்லை ஸ்கேன் செய்யவும்</string>
-    <string name="save">சேமிக்கவும்</string>
     <string name="custom_keyphrase">தனிப்பயன் கீஃப்ரேஸ்</string>
     <string name="generate_keyphrase">முக்கிய சொற்றொடரை உருவாக்கவும்</string>
     <string name="alert_blank_keyphrase">தயவுசெய்து விசைச்சொற்றொடரை உள்ளிடவும்</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index b03118f5..abad8925 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -8,7 +8,6 @@
     <string name="invalid_keyphrase">చెల్లని కీఫ్రేజ్</string>
     <string name="backup_completed">బ్యాకప్ పూర్తయింది</string>
     <string name="scan_password">పాస్‌వర్డ్‌ని స్కాన్ చేయండి</string>
-    <string name="save">సేవ్ చేయండి</string>
     <string name="custom_keyphrase">కస్టమ్ కీఫ్రేజ్</string>
     <string name="credentials_backups">ఆధారాల బ్యాకప్‌లు</string>
     <string name="credentials_backups_desc">బాహ్య నిల్వకు బ్యాకప్ ఆధారాలు</string>
@@ -18,16 +17,10 @@
     <string name="send_feedback_desc">సాంకేతిక సమస్యలను నివేదించండి లేదా కొత్త ఫీచర్లను సూచించండి</string>
     <string name="share">షేర్ చేయండి</string>
     <string name="share_desc">ఇతరులతో యాప్‌ను షేర్ చేయండి</string>
-    <string name="password_length">పాస్వర్డ్ పొడవు</string>
     <string name="password">పాస్వర్డ్</string>
-    <string name="uppercase_alphabets">పెద్ద అక్షరాలు</string>
-    <string name="lowercase_alphabets">చిన్న అక్షరాలు</string>
-    <string name="symbols">చిహ్నాలు</string>
-    <string name="numbers">సంఖ్యలు</string>
     <string name="copied_to_clipboard">క్లిప్‌బోర్డ్‌కి కాపీ చేయబడింది</string>
     <string name="login_to_enter_keypass">కీపాస్‌ని నమోదు చేయడానికి లాగిన్ చేయండి</string>
     <string name="last_backup_date">చివరి బ్యాకప్ : %s</string>
-    <string name="coming_soon">త్వరలో</string>
     <string name="delete_account_title">మీరు చెప్పేది నిజమా\?</string>
     <string name="delete_account_msg">మీరు నిజంగా ఈ ఎంట్రీని తొలగించాలనుకుంటున్నారా, ఇది పునరుద్ధరించబడదు</string>
     <string name="cancel">రద్దు చేయండి</string>
@@ -35,10 +28,7 @@
     <string name="share_keypass">కీపాస్‌ని షేర్ చేయండి</string>
     <string name="message_no_accounts">ఖాతాలు ఏవీ కనుగొనబడలేదు, దయచేసి దిగువ బటన్ నుండి జోడించండి</string>
     <string name="turn_off_backup">బ్యాకప్‌లను ఆఫ్ చేయండి</string>
-    <string name="verify_keyphrase">బ్యాకప్ పాస్‌ఫ్రేజ్‌ని ధృవీకరించండి</string>
-    <string name="verify_keyphrase_message">మీ బ్యాకప్ పాస్‌ఫ్రేజ్‌ని పరీక్షించి, అది సరిపోలుతుందని ధృవీకరించండి</string>
     <string name="backup_folder">బ్యాకప్ ఫోల్డర్</string>
-    <string name="backup">బ్యాకప్</string>
     <string name="turn_on_backup">బ్యాకప్‌లను ఆన్ చేయండి</string>
     <string name="backup_desc">బ్యాకప్‌లు పాస్‌ఫ్రేజ్‌తో గుప్తీకరించబడతాయి మరియు మీ పరికరంలో నిల్వ చేయబడతాయి</string>
     <string name="yes">అవును</string>
@@ -47,7 +37,6 @@
     <string name="copy_keypharse_msg">ఈ కీ పదబంధాన్ని కాపీ చేయండి, ఈ బ్యాకప్‌ని పునరుద్ధరించడానికి ఇది ఉపయోగించబడుతుంది, ఇది మళ్లీ కీపాస్ ద్వారా అందించబడదు, మీరు కాపీ చేసారా లేదా వ్రాసారా\?</string>
     <string name="help">సహాయం</string>
     <string name="security">భద్రత</string>
-    <string name="search">వెతకండి</string>
     <string name="account_name">ఖాతా పేరు</string>
     <string name="username_email_phone">వినియోగదారు పేరు/ఇమెయిల్/ఫోన్</string>
     <string name="tags_comma_separated_optional">ట్యాగ్‌లు కామాతో వేరు చేయబడ్డాయి (ఐచ్ఛికం)</string>
@@ -57,7 +46,6 @@
     <string name="disabled">వికలాంగుడు</string>
     <string name="enabled">ప్రారంభించబడింది</string>
     <string name="override_auto_backup_file">స్వీయ బ్యాకప్ ఫైల్‌ను భర్తీ చేయండి</string>
-    <string name="scanner">స్కానర్</string>
     <string name="alert_black_secret_key">దయచేసి రహస్య కీని నమోదు చేయండి</string>
     <string name="alert_black_account_name">దయచేసి ఖాతా పేరును నమోదు చేయండి</string>
     <string name="add_totp">TOTPని జోడించండి</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 71a61dc9..4b59c3ad 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -16,16 +16,10 @@
     <string name="send_feedback_desc">Sorunları bildirin veya yeni özellikler önerin</string>
     <string name="share">Paylaş</string>
     <string name="share_desc">Uygulamayı diğerleriyle paylaş</string>
-    <string name="password_length">Şifre uzunluğu</string>
     <string name="password">Şifre</string>
-    <string name="uppercase_alphabets">BÜYÜK HARFLER</string>
-    <string name="lowercase_alphabets">küçük harfler</string>
-    <string name="symbols">Semboller</string>
-    <string name="numbers">Sayılar</string>
     <string name="copied_to_clipboard">Panoya kopyalandı</string>
     <string name="login_to_enter_keypass">KeyPass\'e girmek için oturum açın</string>
     <string name="last_backup_date">Son yedek : %s</string>
-    <string name="coming_soon">Yakında</string>
     <string name="delete_account_title">Emin Misiniz?</string>
     <string name="delete_account_msg">Bu girişi gerçekten silmek istiyor musunuz, geri yüklenemez</string>
     <string name="cancel">İptal et</string>
@@ -33,10 +27,7 @@
     <string name="share_keypass">KeyPass\'ı paylaş</string>
     <string name="message_no_accounts">Hesap bulunamadı, lütfen aşağıdaki butondan ekleyin</string>
     <string name="turn_off_backup">Yedekleri kapat</string>
-    <string name="verify_keyphrase">Yedek parolayı doğrulayın</string>
-    <string name="verify_keyphrase_message">Yedek parolanızı test edin ve eşleştiğini doğrulayın</string>
     <string name="backup_folder">Yedekleme klasörü</string>
-    <string name="backup">Yedekle</string>
     <string name="turn_on_backup">Yedekleri aç</string>
     <string name="backup_desc">Yedeklemeler bir parola ile şifrelenir ve cihazınızda depolanır</string>
     <string name="yes">Evet</string>
@@ -45,7 +36,6 @@
     <string name="copy_keypharse_msg">Bu Anahtar İfadeyi Kopyalayın, bu yedeği kurtarmak için kullanılacaktır, bu KeyPass tarafından tekrar sağlanmayacaktır, kopyaladınız mı veya not aldınız mı\?</string>
     <string name="help">Yardım</string>
     <string name="security">Güvenlik</string>
-    <string name="search">Ara</string>
     <string name="account_name">Hesap Adı</string>
     <string name="username_email_phone">Kullanıcı adı/Email/Telefon</string>
     <string name="tags_comma_separated_optional">Etiketleri virgülle ayır (isteğe bağlı)</string>
@@ -55,12 +45,10 @@
     <string name="disabled">Devre dışı bırakıldı</string>
     <string name="enabled">Etkinleştirildi</string>
     <string name="override_auto_backup_file">Otomatik Yedekleme Dosyasını Geçersiz Kıl</string>
-    <string name="scanner">Tarayıcı</string>
     <string name="alert_black_secret_key">Lütfen secret key\'i girin</string>
     <string name="alert_black_account_name">Lütfen hesap adı girin</string>
     <string name="add_totp">TOTP ekle</string>
     <string name="scan_password">Şifre Tara</string>
-    <string name="save">Kaydet</string>
     <string name="custom_keyphrase">Özel Anahtar Kelime</string>
     <string name="generate_keyphrase">Anahtar Kelime Üret</string>
     <string name="alert_blank_keyphrase">Lütfen anahtar kelimeyi girin</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 436ec9c1..aeb17981 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -33,26 +33,17 @@
     <string name="restore_credentials">Відновити облікові дані</string>
     <string name="restore_credentials_desc">Відновлення резервної копії</string>
     <string name="send_feedback">Надіслати відгук</string>
-    <string name="uppercase_alphabets">ВЕЛИКІ БУКВИ</string>
-    <string name="lowercase_alphabets">малі букви</string>
-    <string name="symbols">Символи</string>
-    <string name="numbers">Числа</string>
     <string name="login_to_enter_keypass">Увійдіть, щоб зайти в KeyPass</string>
     <string name="last_backup_date">Остання резервна копія: %s</string>
-    <string name="coming_soon">Незабаром</string>
     <string name="delete_account_msg">Ви справді хочете видалити цей запис, його неможливо відновити</string>
     <string name="cancel">Скасувати</string>
     <string name="feedback_to_keypass">Зворотній зв\'язок із KeyPass</string>
     <string name="turn_off_backup">Вимкнути резервне копіювання</string>
-    <string name="verify_keyphrase">Перевірте резервну парольну фразу</string>
-    <string name="verify_keyphrase_message">Перевірте резервну парольну фразу та переконайтеся, що вона збігається</string>
     <string name="backup_folder">Каталог резервного копіювання</string>
-    <string name="backup">Резервна копія</string>
     <string name="turn_on_backup">Увімкнути резервне копіювання</string>
     <string name="yes">Так</string>
     <string name="add_totp">Додати TOTP</string>
     <string name="scan_password">Пароль для сканування</string>
-    <string name="save">Зберегти</string>
     <string name="custom_keyphrase">Користувацька парольна фраза</string>
     <string name="set_keyphrase">Установити парольну фразу</string>
     <string name="ascending">За сходженням</string>
@@ -75,7 +66,6 @@
     <string name="backup_completed">Резервне копіювання завершено</string>
     <string name="credentials_backups">Резервні копії облікових даних</string>
     <string name="send_feedback_desc">Повідомляйте про технічні проблеми або пропонуйте нові функції</string>
-    <string name="password_length">Довжина пароля</string>
     <string name="share">Поділитися</string>
     <string name="copied_to_clipboard">Скопійовано в буфер обміну</string>
     <string name="share_desc">Поділіться програмою з іншими</string>
@@ -89,9 +79,7 @@
     <string name="security">Безпека</string>
     <string name="alert">Попередження</string>
     <string name="help">Довідка</string>
-    <string name="scanner">Сканер</string>
     <string name="override_auto_backup_file">Перевизначити файл автоматичної резервної копії</string>
-    <string name="search">Пошук</string>
     <string name="alert_black_secret_key">Уведіть таємний ключ</string>
     <string name="website_url_optional">Адреса вебсайту (необов\'язково)</string>
     <string name="account_name">Ім\'я облікового запису</string>
diff --git a/app/src/main/res/values-ur-rIN/strings.xml b/app/src/main/res/values-ur-rIN/strings.xml
index 24de11bb..38d6eb22 100644
--- a/app/src/main/res/values-ur-rIN/strings.xml
+++ b/app/src/main/res/values-ur-rIN/strings.xml
@@ -17,16 +17,10 @@
     <string name="send_feedback_desc">تکنیکی مسائل کی اطلاع دیں یا نئی خصوصیات تجویز کریں</string>
     <string name="share">بانٹیں</string>
     <string name="share_desc">دوسروں کے ساتھ ایپ کا اشتراک کریں</string>
-    <string name="password_length">پاس ورڈ کی لمبائی</string>
     <string name="password">پاس ورڈ</string>
-    <string name="uppercase_alphabets">بڑے حروف تہجی</string>
-    <string name="lowercase_alphabets">چھوٹے حروف تہجی</string>
-    <string name="symbols">علامتیں</string>
-    <string name="numbers">نمبرز</string>
     <string name="copied_to_clipboard">کلپ بورڈ پر کاپی ہو گیا</string>
     <string name="login_to_enter_keypass">KeyPass میں داخل ہونے کے لیے لاگ ان کریں</string>
     <string name="last_backup_date">آخری بیک اپ: %s</string>
-    <string name="coming_soon">جلد آرہا ہے</string>
     <string name="delete_account_title">کیا تمہیں یقین ہے؟</string>
     <string name="delete_account_msg">کیا آپ واقعی اس اندراج کو حذف کرنا چاہتے ہیں، اسے بحال نہیں کیا جا سکتا</string>
     <string name="cancel">منسوخ کریں</string>
@@ -34,10 +28,7 @@
     <string name="share_keypass">کی پاس شیئر کریں</string>
     <string name="message_no_accounts">کوئی اکاؤنٹ نہیں ملا، براہ کرم نیچے والے بٹن سے شامل کریں</string>
     <string name="turn_off_backup">بیک اپ کو آف کریں</string>
-    <string name="verify_keyphrase">بیک اپ پاسفریز کی تصدیق کریں</string>
-    <string name="verify_keyphrase_message">اپنے بیک اپ پاسفریز کی جانچ کریں اور تصدیق کریں کہ یہ مماثل ہے</string>
     <string name="backup_folder">بیک اپ فولڈر</string>
-    <string name="backup">بیک اپ</string>
     <string name="turn_on_backup">بیک اپ آن کریں</string>
     <string name="backup_desc">بیک اپس کو پاس فریز کے ساتھ انکرپٹ کیا جاتا ہے اور آپ کے آلے پر اسٹور کیا جاتا ہے</string>
     <string name="yes">جی ہاں</string>
@@ -46,7 +37,6 @@
     <string name="copy_keypharse_msg">اس کلیدی جملے کو کاپی کریں اس بیک اپ کو بازیافت کرنے کے لیے استعمال کیا جائے گا، یہ KeyPass دوبارہ فراہم نہیں کرے گا، کیا آپ نے کاپی کیا ہے یا لکھ دیا ہے؟</string>
     <string name="help">مدد</string>
     <string name="security">سیکورٹی</string>
-    <string name="search">تلاش کریں</string>
     <string name="account_name">کھاتے کا نام</string>
     <string name="username_email_phone">صارف نام/ای میل/فون</string>
     <string name="tags_comma_separated_optional">ٹیگز کوما سے الگ کیا گیا (اختیاری)</string>
@@ -56,12 +46,10 @@
     <string name="disabled">معذور</string>
     <string name="enabled">فعال</string>
     <string name="override_auto_backup_file">آٹو بیک اپ فائل کو اوور رائیڈ کریں</string>
-    <string name="scanner">سکینر</string>
     <string name="alert_black_secret_key">براہ کرم خفیہ کلید درج کریں</string>
     <string name="alert_black_account_name">براہ کرم اکاؤنٹ کا نام درج کریں</string>
     <string name="add_totp">TOTP شامل کریں</string>
     <string name="scan_password">پاس ورڈ اسکین کریں</string>
-    <string name="save">محفوظ کریں۔</string>
     <string name="custom_keyphrase">حسب ضرورت کلیدی جملہ</string>
     <string name="generate_keyphrase">کلیدی جملہ بنائیں</string>
     <string name="alert_blank_keyphrase">براہ کرم کلیدی جملہ درج کریں</string>
diff --git a/app/src/main/res/values-ur-rPK/strings.xml b/app/src/main/res/values-ur-rPK/strings.xml
index a6da0160..37ff0774 100644
--- a/app/src/main/res/values-ur-rPK/strings.xml
+++ b/app/src/main/res/values-ur-rPK/strings.xml
@@ -15,16 +15,10 @@
     <string name="send_feedback_desc">تکنیکی مسائل کی اطلاع دیں یا نئی خصوصیات تجویز کریں</string>
     <string name="share">بانٹیں</string>
     <string name="share_desc">دوسروں کے ساتھ ایپ کا اشتراک کریں</string>
-    <string name="password_length">پاس ورڈ کی لمبائی</string>
     <string name="password">پاس ورڈ</string>
-    <string name="uppercase_alphabets">بڑے حروف تہجی</string>
-    <string name="lowercase_alphabets">چھوٹے حروف تہجی</string>
-    <string name="symbols">علامتیں</string>
-    <string name="numbers">نمبرز</string>
     <string name="copied_to_clipboard">کلپ بورڈ پر کاپی ہو گیا</string>
     <string name="login_to_enter_keypass">KeyPass میں داخل ہونے کے لیے لاگ ان کریں</string>
     <string name="last_backup_date">آخری بیک اپ: %s</string>
-    <string name="coming_soon">جلد آرہا ہے</string>
     <string name="delete_account_title">کیا تمہیں یقین ہے؟</string>
     <string name="delete_account_msg">کیا آپ واقعی اس اندراج کو حذف کرنا چاہتے ہیں، اسے بحال نہیں کیا جا سکتا</string>
     <string name="cancel">منسوخ کریں</string>
@@ -32,10 +26,7 @@
     <string name="share_keypass">کی پاس شیئر کریں</string>
     <string name="message_no_accounts">کوئی اکاؤنٹ نہیں ملا، براہ کرم نیچے والے بٹن سے شامل کریں</string>
     <string name="turn_off_backup">بیک اپ کو آف کریں</string>
-    <string name="verify_keyphrase">بیک اپ پاسفریز کی تصدیق کریں</string>
-    <string name="verify_keyphrase_message">اپنے بیک اپ پاسفریز کی جانچ کریں اور تصدیق کریں کہ یہ مماثل ہے</string>
     <string name="backup_folder">بیک اپ فولڈر</string>
-    <string name="backup">بیک اپ</string>
     <string name="turn_on_backup">بیک اپ آن کریں</string>
     <string name="backup_desc">بیک اپس کو پاس فریز کے ساتھ انکرپٹ کیا جاتا ہے اور آپ کے آلے پر اسٹور کیا جاتا ہے</string>
     <string name="yes">جی ہاں</string>
@@ -44,7 +35,6 @@
     <string name="copy_keypharse_msg">اس کلیدی جملے کو کاپی کریں اس بیک اپ کو بازیافت کرنے کے لیے استعمال کیا جائے گا، یہ KeyPass دوبارہ فراہم نہیں کرے گا، کیا آپ نے کاپی کیا ہے یا لکھ دیا ہے؟</string>
     <string name="help">مدد</string>
     <string name="security">سیکورٹی</string>
-    <string name="search">تلاش کریں</string>
     <string name="account_name">کھاتے کا نام</string>
     <string name="username_email_phone">صارف نام/ای میل/فون</string>
     <string name="tags_comma_separated_optional">ٹیگز کوما سے الگ کیا گیا (اختیاری)</string>
@@ -54,12 +44,10 @@
     <string name="disabled">معذور</string>
     <string name="enabled">فعال</string>
     <string name="override_auto_backup_file">آٹو بیک اپ فائل کو اوور رائیڈ کریں</string>
-    <string name="scanner">سکینر</string>
     <string name="alert_black_secret_key">براہ کرم خفیہ کلید درج کریں</string>
     <string name="alert_black_account_name">براہ کرم اکاؤنٹ کا نام درج کریں</string>
     <string name="add_totp">TOTP شامل کریں</string>
     <string name="scan_password">پاس ورڈ اسکین کریں</string>
-    <string name="save">محفوظ کریں۔</string>
     <string name="custom_keyphrase">حسب ضرورت کلیدی جملہ</string>
     <string name="generate_keyphrase">کلیدی جملہ بنائیں</string>
     <string name="alert_blank_keyphrase">براہ کرم کلیدی جملہ درج کریں</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 725f887b..491c5937 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -18,16 +18,10 @@
     <string name="send_feedback_desc">تکنیکی مسائل کی اطلاع دیں یا نئی خصوصیات تجویز کریں</string>
     <string name="share">بانٹیں</string>
     <string name="share_desc">دوسروں کے ساتھ ایپ کا اشتراک کریں</string>
-    <string name="password_length">پاس ورڈ کی لمبائی</string>
     <string name="password">پاس ورڈ</string>
-    <string name="uppercase_alphabets">بڑے حروف تہجی</string>
-    <string name="lowercase_alphabets">چھوٹے حروف تہجی</string>
-    <string name="symbols">علامتیں</string>
-    <string name="numbers">نمبرز</string>
     <string name="copied_to_clipboard">کلپ بورڈ پر کاپی ہو گیا</string>
     <string name="login_to_enter_keypass">KeyPass میں داخل ہونے کے لیے لاگ ان کریں</string>
     <string name="last_backup_date">آخری بیک اپ: %s</string>
-    <string name="coming_soon">جلد آرہا ہے</string>
     <string name="delete_account_title">کیا تمہیں یقین ہے؟</string>
     <string name="delete_account_msg">کیا آپ واقعی اس اندراج کو حذف کرنا چاہتے ہیں، اسے بحال نہیں کیا جا سکتا</string>
     <string name="cancel">منسوخ کریں</string>
@@ -35,10 +29,7 @@
     <string name="share_keypass">کی پاس شیئر کریں</string>
     <string name="message_no_accounts">کوئی اکاؤنٹ نہیں ملا، براہ کرم نیچے والے بٹن سے شامل کریں</string>
     <string name="turn_off_backup">بیک اپ کو آف کریں</string>
-    <string name="verify_keyphrase">بیک اپ پاسفریز کی تصدیق کریں</string>
-    <string name="verify_keyphrase_message">اپنے بیک اپ پاسفریز کی جانچ کریں اور تصدیق کریں کہ یہ مماثل ہے</string>
     <string name="backup_folder">بیک اپ فولڈر</string>
-    <string name="backup">بیک اپ</string>
     <string name="turn_on_backup">بیک اپ آن کریں</string>
     <string name="backup_desc">بیک اپس کو پاس فریز کے ساتھ انکرپٹ کیا جاتا ہے اور آپ کے آلے پر اسٹور کیا جاتا ہے</string>
     <string name="yes">جی ہاں</string>
@@ -47,7 +38,6 @@
     <string name="copy_keypharse_msg">اس کلیدی جملے کو کاپی کریں اس بیک اپ کو بازیافت کرنے کے لیے استعمال کیا جائے گا، یہ KeyPass دوبارہ فراہم نہیں کرے گا، کیا آپ نے کاپی کیا ہے یا لکھ دیا ہے؟</string>
     <string name="help">مدد</string>
     <string name="security">سیکورٹی</string>
-    <string name="search">تلاش کریں</string>
     <string name="account_name">کھاتے کا نام</string>
     <string name="username_email_phone">صارف نام/ای میل/فون</string>
     <string name="tags_comma_separated_optional">ٹیگز کوما سے الگ کیا گیا (اختیاری)</string>
@@ -57,12 +47,10 @@
     <string name="disabled">معذور</string>
     <string name="enabled">فعال</string>
     <string name="override_auto_backup_file">آٹو بیک اپ فائل کو اوور رائیڈ کریں</string>
-    <string name="scanner">سکینر</string>
     <string name="alert_black_secret_key">براہ کرم خفیہ کلید درج کریں</string>
     <string name="alert_black_account_name">براہ کرم اکاؤنٹ کا نام درج کریں</string>
     <string name="add_totp">TOTP شامل کریں</string>
     <string name="scan_password">پاس ورڈ اسکین کریں</string>
-    <string name="save">محفوظ کریں۔</string>
     <string name="custom_keyphrase">حسب ضرورت کلیدی جملہ</string>
     <string name="generate_keyphrase">کلیدی جملہ بنائیں</string>
     <string name="alert_blank_keyphrase">براہ کرم کلیدی جملہ درج کریں</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e680c8ba..87dc68eb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -16,12 +16,7 @@
     <string name="send_feedback_desc">报告技术问题或建议新功能</string>
     <string name="share">分享</string>
     <string name="share_desc">向别人分享该应用</string>
-    <string name="password_length">密码长度</string>
     <string name="password">密码</string>
-    <string name="uppercase_alphabets">大写字母</string>
-    <string name="lowercase_alphabets">小写字母</string>
-    <string name="symbols">标点符号</string>
-    <string name="numbers">数字</string>
     <string name="copied_to_clipboard">已复制到剪切板</string>
     <string name="login_to_enter_keypass">输入密码以进入 KeyPass</string>
     <string name="biometric_error_no_hardware">此设备上没有可用的生物识别功能。</string>
@@ -31,7 +26,6 @@
     <string name="password_set_from_settings">请先从手机设置中为您的设备设置密码</string>
     <string name="authentication_failed">身份认证失败</string>
     <string name="last_backup_date">上次备份： %s</string>
-    <string name="coming_soon">敬请期待</string>
     <string name="delete_account_title">您确定吗？</string>
     <string name="delete_account_msg">您确定要删除本条目吗？此操作不可撤销</string>
     <string name="cancel">Cancel</string>
@@ -39,10 +33,7 @@
     <string name="share_keypass">分享 KeyPass</string>
     <string name="message_no_accounts">这里空空如也。按下下方的加号以新建</string>
     <string name="turn_off_backup">关闭备份</string>
-    <string name="verify_keyphrase">验证备份密码</string>
-    <string name="verify_keyphrase_message">测试备份密码并验证其匹配</string>
     <string name="backup_folder">备份文件夹</string>
-    <string name="backup">备份</string>
     <string name="turn_on_backup">开启备份</string>
     <string name="backup_desc">备份使用密码加密并存储在您的设备上</string>
     <string name="yes">确定</string>
@@ -51,7 +42,6 @@
     <string name="copy_keypharse_msg">请立即复制或在纸上写下下面的密码。KeyPass 将不会再次显示该密码\?</string>
     <string name="help">帮助</string>
     <string name="security">安全</string>
-    <string name="search">搜索</string>
     <string name="account_name">账户名称</string>
     <string name="username_email_phone">用户名/邮箱/手机号</string>
     <string name="tags_comma_separated_optional">标签（选填）</string>
@@ -64,9 +54,7 @@
     <string name="add_totp">添加 TOTP</string>
     <string name="alert_black_account_name">请输入账户名</string>
     <string name="alert_black_secret_key">请输入密钥</string>
-    <string name="scanner">扫描器</string>
     <string name="scan_password">扫描密码</string>
-    <string name="save">保存</string>
     <string name="custom_keyphrase">自定义关键词</string>
     <string name="generate_keyphrase">生成关键词</string>
     <string name="alert_blank_keyphrase">请输入关键词</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index df9cc0ba..dd609797 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,7 +9,6 @@
     <color name="keypass_blue_100">#d2dbe0</color>
     <color name="keypass_blue_200">#adbbc4</color>
     <color name="keypass_blue_300">#8ca2ae</color>
-    <color name="keypass_blue_600">#4a6572</color>
     <color name="keypass_blue_700">#344955</color>
     <color name="keypass_blue_800">#232f34</color>
     <color name="blue_800">#6c63ff</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 26994459..2c124a63 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,7 +15,6 @@
 <resources>
 
     <!--BottomAppBar-->
-    <dimen name="bottom_app_bar_height">56dp</dimen>
 
     <!--BottomNavigationDrawer-->
 
diff --git a/app/src/main/res/values/layout.xml b/app/src/main/res/values/layout.xml
index 3408fb69..d628a854 100644
--- a/app/src/main/res/values/layout.xml
+++ b/app/src/main/res/values/layout.xml
@@ -21,7 +21,5 @@
 
     <!--8dp grid-->
     <dimen name="grid_1">8dp</dimen>
-    <dimen name="grid_2">16dp</dimen>
-    <dimen name="grid_3">24dp</dimen>
     <dimen name="grid_4">32dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b8cd5f2..9a5378e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,17 +22,11 @@
     <string name="send_feedback_desc">Report technical issues or suggest new features</string>
     <string name="share">Share</string>
     <string name="share_desc">Share app with others</string>
-    <string name="password_length">Password length</string>
     <string name="password">Password</string>
-    <string name="uppercase_alphabets">UPPERCASE ALPHABETS</string>
-    <string name="lowercase_alphabets">lowercase alphabets</string>
-    <string name="symbols">Symbols</string>
-    <string name="numbers">Numbers</string>
     <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="login_to_enter_keypass">Login to enter KeyPass</string>
 
     <string name="last_backup_date">Last backup : %s</string>
-    <string name="coming_soon">Coming Soon</string>
     <string name="delete_account_title">Are you sure?</string>
     <string name="delete_account_msg">Do you really want to delete this entry, it can\'t be restored</string>
     <string name="cancel">Cancel</string>
@@ -40,10 +34,7 @@
     <string name="share_keypass">Share KeyPass</string>
     <string name="message_no_accounts">No Accounts found, please add from below button</string>
     <string name="turn_off_backup">Turn Off Backups</string>
-    <string name="verify_keyphrase">Verify backup passphrase</string>
-    <string name="verify_keyphrase_message">Test your backup passphrase and verify that it matches</string>
     <string name="backup_folder">Backup Folder</string>
-    <string name="backup">Backup</string>
     <string name="turn_on_backup">Turn On Backups</string>
     <string name="backup_desc">Backups are encrypted with a passphrase and stored on your device</string>
     <string name="yes">Yes</string>
@@ -52,7 +43,6 @@
     <string name="copy_keypharse_msg">Copy This Key Phrase this will be used to recover this backup, this will not be provided by KeyPass Again, have you copied or written down?</string>
     <string name="help">Help</string>
     <string name="security">Security</string>
-    <string name="search">Search</string>
     <string name="account_name">Account Name</string>
     <string name="username_email_phone">Username/Email/Phone</string>
     <string name="tags_comma_separated_optional">Tags comma separated (optional)</string>
@@ -62,12 +52,10 @@
     <string name="disabled">Disabled</string>
     <string name="enabled">Enabled</string>
     <string name="override_auto_backup_file">Override Auto Backup File</string>
-    <string name="scanner">Scanner</string>
     <string name="alert_black_secret_key">Please enter secret key</string>
     <string name="alert_black_account_name">Please enter account name</string>
     <string name="add_totp">Add TOTP</string>
     <string name="scan_password">Scan Password</string>
-    <string name="save">Save</string>
     <string name="custom_keyphrase">Custom Keyphrase</string>
     <string name="generate_keyphrase">Generate Keyphrase</string>
     <string name="alert_blank_keyphrase">Please enter keyphrase</string>
diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml
index 74cfd201..0d2c4cc4 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="settings_backup" translatable="false">backup</string>
-    <string name="settings_verify_key_phrase" translatable="false">settings_verify_key_phrase</string>
-    <string name="settings_restore_backup" translatable="false">restore_backup</string>
-    <string name="settings_feedback" translatable="false">feedback</string>
-    <string name="settings_share_app" translatable="false">share</string>
-    <string name="settings_start_backup" translatable="false">start_backup</string>
-    <string name="settings_create_backup" translatable="false">create_backup</string>
-    <string name="settings_backup_folder" translatable="false">backup_folder</string>
-    <string name="settings_stop_backup" translatable="false">stop_backup</string>
-    <string name="settings_auto_backup" translatable="false">auto_backup</string>
-    <string name="settings_cat_auto_backup" translatable="false">cat_auto_backup</string>
-    <string name="settings_override_auto_backup" translatable="false">override_auto_backup</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style_text.xml b/app/src/main/res/values/style_text.xml
index 1f3f353d..0d2c4cc4 100644
--- a/app/src/main/res/values/style_text.xml
+++ b/app/src/main/res/values/style_text.xml
@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="TextStyle">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
-        <item name="android:textColor">@color/color_on_surface_emphasis_medium</item>
-    </style>
 
-    <style name="TextStyle.Heading">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/color_on_surface_emphasis_high</item>
-        <item name="android:textAppearance">?attr/textAppearanceHeadline1</item>
-
-    </style>
-
-    <style name="TextStyle.SubHeading">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/color_on_surface_emphasis_medium</item>
-    </style>
-    
 </resources>
\ No newline at end of file