diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
index ad0642da83..284f3debd2 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
@@ -13,6 +13,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
+import androidx.core.content.ContextCompat
 import androidx.core.widget.addTextChangedListener
 import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.R
@@ -51,8 +52,10 @@ class CheckPassphraseStrengthFragment :
     initPasswordStrengthViewModel()
   }
 
-  override fun onButtonContinueColorChanged(colorFilter: ColorFilter) {
-    binding?.btSetPassphrase?.background?.colorFilter = colorFilter
+  override fun onButtonContinueColorChanged(colorRes: Int) {
+    context?.let {
+      binding?.btSetPassphrase?.backgroundTintList = ContextCompat.getColorStateList(it, colorRes)
+    }
   }
 
   override fun onPassphraseQualityChanged(progress: Int) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt
index 7dfdb50d63..a2e206336a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt
@@ -11,6 +11,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
+import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.setFragmentResult
@@ -47,8 +48,11 @@ class CreatePrivateKeyFirstFragment :
     subscribeToCreatePrivateKey()
   }
 
-  override fun onButtonContinueColorChanged(colorFilter: ColorFilter) {
-    binding?.buttonSetPassPhrase?.background?.colorFilter = colorFilter
+  override fun onButtonContinueColorChanged(colorRes: Int) {
+    context?.let {
+      binding?.buttonSetPassPhrase?.backgroundTintList =
+        ContextCompat.getColorStateList(it, colorRes)
+    }
   }
 
   override fun onPassphraseQualityChanged(progress: Int) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt
index 72299c6266..4e4a561137 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt
@@ -16,7 +16,7 @@ import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
 import android.view.View
 import android.widget.Toast
-import androidx.core.content.ContextCompat
+import androidx.annotation.ColorRes
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.fragment.app.viewModels
@@ -48,7 +48,7 @@ abstract class BasePassphraseStrengthFragment<T : ViewBinding> : BaseFragment<T>
   protected val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels()
   protected var pwdStrengthResult: PgpPwd.PwdStrengthResult? = null
 
-  abstract fun onButtonContinueColorChanged(colorFilter: ColorFilter)
+  abstract fun onButtonContinueColorChanged(@ColorRes colorRes: Int)
   abstract fun onPassphraseQualityChanged(progress: Int)
   abstract fun onPassphraseQualityProgressDrawableColorChanged(colorFilter: ColorFilter)
   abstract fun onPassphraseQualityTextChanged(charSequence: CharSequence)
@@ -132,17 +132,11 @@ abstract class BasePassphraseStrengthFragment<T : ViewBinding> : BaseFragment<T>
     when (word?.word) {
       Constants.PASSWORD_QUALITY_WEAK,
       Constants.PASSWORD_QUALITY_POOR -> {
-        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-          ContextCompat.getColor(requireContext(), R.color.silver), BlendModeCompat.MODULATE
-        )
-        colorFilter?.let { onButtonContinueColorChanged(it) }
+        onButtonContinueColorChanged(R.color.silver)
       }
 
       else -> {
-        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-          ContextCompat.getColor(requireContext(), R.color.colorPrimary), BlendModeCompat.MODULATE
-        )
-        colorFilter?.let { onButtonContinueColorChanged(it) }
+        onButtonContinueColorChanged(R.color.colorPrimary)
       }
     }
 
diff --git a/FlowCrypt/src/main/res/drawable/ic_plus_white_24dp.xml b/FlowCrypt/src/main/res/drawable/ic_plus_white_24dp.xml
new file mode 100644
index 0000000000..701e2f211f
--- /dev/null
+++ b/FlowCrypt/src/main/res/drawable/ic_plus_white_24dp.xml
@@ -0,0 +1,15 @@
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: DenBond7
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M 22 6 V 22 L 6 22 V 26 H 22 V 42 H 26 V 26 H 42 V 22 H 26 L 26 6 Z Z Z" />
+</vector>
diff --git a/FlowCrypt/src/main/res/layout/action_item_switch.xml b/FlowCrypt/src/main/res/layout/action_item_switch.xml
index 7f8e219d2a..f7f83a18ea 100644
--- a/FlowCrypt/src/main/res/layout/action_item_switch.xml
+++ b/FlowCrypt/src/main/res/layout/action_item_switch.xml
@@ -8,5 +8,4 @@
     android:id="@+id/switchShowOnlyEncryptedMessages"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:theme="@style/AppWidget.Switch"
     tools:checked="true" />
diff --git a/FlowCrypt/src/main/res/layout/activity_create_message.xml b/FlowCrypt/src/main/res/layout/activity_create_message.xml
index 17fb57abbb..50bd61192e 100644
--- a/FlowCrypt/src/main/res/layout/activity_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/activity_create_message.xml
@@ -15,18 +15,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        android:theme="@style/AppTheme.NoActionBar.AppBarOverlay"
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
-            app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay" />
+            android:layout_height="wrap_content" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/FlowCrypt/src/main/res/layout/activity_main.xml b/FlowCrypt/src/main/res/layout/activity_main.xml
index cada61ca7a..403db082e4 100644
--- a/FlowCrypt/src/main/res/layout/activity_main.xml
+++ b/FlowCrypt/src/main/res/layout/activity_main.xml
@@ -20,18 +20,15 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
-            android:theme="@style/AppTheme.NoActionBar.AppBarOverlay"
-            android:visibility="visible"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay" />
+                android:layout_height="wrap_content" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/FlowCrypt/src/main/res/layout/fragment_add_other_account.xml b/FlowCrypt/src/main/res/layout/fragment_add_other_account.xml
index a1216349c8..5518a95b2a 100644
--- a/FlowCrypt/src/main/res/layout/fragment_add_other_account.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_add_other_account.xml
@@ -45,11 +45,10 @@
 
             <Button
                 android:id="@+id/buttonSignInWithOutlook"
-                style="@style/AppWidget.Button.White.ConnectAccount"
+                style="@style/AppWidget.Button.Big.OutlinedWithIcon"
                 android:layout_marginTop="@dimen/default_margin_content"
-                android:drawableStart="@drawable/ic_outlook_24dp"
                 android:text="@string/continue_with_outlook_hotmail"
-                android:theme="@style/AppWidget.Button.White.ConnectAccount"
+                app:icon="@drawable/ic_outlook_24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
@@ -438,18 +437,17 @@
 
             <Button
                 android:id="@+id/buttonTryToConnect"
-                style="@style/AppWidget.Button"
+                style="@style/AppWidget.Button.Big"
                 android:layout_width="0dp"
                 android:layout_marginBottom="@dimen/default_margin_content_big"
                 android:text="@string/try_to_connect"
-                android:theme="@style/AppWidget.Button.Green"
                 app:layout_constraintBottom_toTopOf="@+id/buttonHelp"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
 
             <Button
                 android:id="@+id/buttonHelp"
-                style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+                style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
                 android:layout_marginBottom="@dimen/default_margin_content"
                 android:text="@string/help"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/FlowCrypt/src/main/res/layout/fragment_backup_keys.xml b/FlowCrypt/src/main/res/layout/fragment_backup_keys.xml
index 1cf7433571..91f75524f5 100644
--- a/FlowCrypt/src/main/res/layout/fragment_backup_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_backup_keys.xml
@@ -21,8 +21,7 @@
             android:layout_weight="1"
             android:checked="true"
             android:text="@string/email"
-            android:textAllCaps="true"
-            android:theme="@style/AppWidget.RadioButton" />
+            android:textAllCaps="true" />
 
         <RadioButton
             android:id="@+id/rBDownloadOption"
@@ -31,18 +30,16 @@
             android:layout_marginTop="@dimen/default_margin_medium"
             android:layout_weight="1"
             android:text="@string/download"
-            android:textAllCaps="true"
-            android:theme="@style/AppWidget.RadioButton" />
+            android:textAllCaps="true" />
     </RadioGroup>
 
     <Button
         android:id="@+id/btBackup"
-        style="@style/AppWidget.Button.Green"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/default_margin_content"
         android:text="@string/backup_as_email"
         android:textAllCaps="true"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toBottomOf="@+id/rGBackupOptions" />
diff --git a/FlowCrypt/src/main/res/layout/fragment_change_passphrase_of_imported_keys.xml b/FlowCrypt/src/main/res/layout/fragment_change_passphrase_of_imported_keys.xml
index 9cb8e62b73..e7f91f26ec 100644
--- a/FlowCrypt/src/main/res/layout/fragment_change_passphrase_of_imported_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_change_passphrase_of_imported_keys.xml
@@ -33,11 +33,10 @@
 
     <Button
         android:id="@+id/btContinue"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_top_button_continue"
         android:text="@string/continue_"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_check_keys.xml b/FlowCrypt/src/main/res/layout/fragment_check_keys.xml
index f84c2bffd2..f43a07e2b9 100644
--- a/FlowCrypt/src/main/res/layout/fragment_check_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_check_keys.xml
@@ -145,10 +145,9 @@
 
         <Button
             android:id="@+id/buttonPositiveAction"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_top_load_account"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -157,11 +156,10 @@
 
         <Button
             android:id="@+id/buttonSkipRemainingBackups"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_top_load_account"
             android:text="@string/skip_remaining_backups"
-            android:theme="@style/AppWidget.Button.Green"
             android:visibility="gone"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
@@ -170,11 +168,10 @@
 
         <Button
             android:id="@+id/buttonNegativeAction"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.OutlinedButton.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_top_button_select_another_account"
             android:layout_marginBottom="@dimen/margin_top_button_select_another_account"
-            android:theme="@style/AppWidget.Button.White"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_check_passphrase_strength.xml b/FlowCrypt/src/main/res/layout/fragment_check_passphrase_strength.xml
index 734f3d83b1..b836986252 100644
--- a/FlowCrypt/src/main/res/layout/fragment_check_passphrase_strength.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_check_passphrase_strength.xml
@@ -88,11 +88,10 @@
 
     <Button
         android:id="@+id/btSetPassphrase"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big.SilverWithWhiteText"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/default_margin_content_big"
         android:text="@string/set_pass_phrase"
-        android:theme="@style/AppWidget.Button.SilverWithWhiteText"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_message.xml b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
index d05227fceb..c47147a159 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
@@ -215,18 +215,16 @@
 
             </FrameLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnSetWebPortalPassword"
-                style="@style/AppWidget.Button"
+                style="@style/AppWidget.Button.Big.Orange"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/default_button_height_small"
                 android:layout_gravity="center"
-                android:drawableStart="@drawable/ic_password_not_protected_white_24"
-                android:drawablePadding="@dimen/default_margin_small"
                 android:text="@string/tap_to_protect_with_web_portal_password"
                 android:textAllCaps="false"
-                android:theme="@style/AppWidget.Button.Orange"
-                android:visibility="gone" />
+                android:visibility="gone"
+                app:icon="@drawable/ic_password_not_protected_white_24" />
 
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/AppWidget.TextInputLayout.GreyBottomLine"
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_or_import_private_key_during_setup.xml b/FlowCrypt/src/main/res/layout/fragment_create_or_import_private_key_during_setup.xml
index 29a54728bd..d70419d62e 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_or_import_private_key_during_setup.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_or_import_private_key_during_setup.xml
@@ -22,11 +22,10 @@
 
         <Button
             android:id="@+id/buttonCreateNewKey"
-            style="@style/AppWidget.Button.Green"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/first_button_padding"
             android:text="@string/create_a_new_key"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -34,11 +33,10 @@
 
         <Button
             android:id="@+id/buttonImportMyKey"
-            style="@style/AppWidget.Button.Green"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_between_buttons"
             android:text="@string/import_my_key"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -46,11 +44,10 @@
 
         <Button
             android:id="@+id/buttonSelectAnotherAccount"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.OutlinedButton.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_between_buttons"
             android:text="@string/use_another_account"
-            android:theme="@style/AppWidget.Button.White"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_private_key_dialog.xml b/FlowCrypt/src/main/res/layout/fragment_create_private_key_dialog.xml
index f88bd2b8ec..5d76907e92 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_private_key_dialog.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_private_key_dialog.xml
@@ -33,7 +33,7 @@
 
     <Button
         android:id="@+id/btRetry"
-        style="@style/AppWidget.Button.Green"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content"
@@ -41,7 +41,6 @@
         android:layout_marginEnd="@dimen/default_margin_content"
         android:text="@string/retry"
         android:textAllCaps="true"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_private_key_first.xml b/FlowCrypt/src/main/res/layout/fragment_create_private_key_first.xml
index 030a103e6e..9ad32a26f0 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_private_key_first.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_private_key_first.xml
@@ -92,11 +92,10 @@
 
         <Button
             android:id="@+id/buttonSetPassPhrase"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big.SilverWithWhiteText"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/default_margin_content_big"
             android:text="@string/set_pass_phrase"
-            android:theme="@style/AppWidget.Button.SilverWithWhiteText"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_private_key_second.xml b/FlowCrypt/src/main/res/layout/fragment_create_private_key_second.xml
index 2d1ae2a240..230c841380 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_private_key_second.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_private_key_second.xml
@@ -74,11 +74,10 @@
 
         <Button
             android:id="@+id/buttonConfirmPassPhrases"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/default_margin_content_big"
             android:text="@string/confirm_pass_phrase"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRightSecond"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeftSecond"
@@ -86,11 +85,10 @@
 
         <Button
             android:id="@+id/buttonUseAnotherPassPhrase"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big.SilverWithWhiteText"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_between_buttons"
             android:text="@string/use_another_pass_phrase"
-            android:theme="@style/AppWidget.Button.SilverWithWhiteText"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRightSecond"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeftSecond"
diff --git a/FlowCrypt/src/main/res/layout/fragment_edit_contact.xml b/FlowCrypt/src/main/res/layout/fragment_edit_contact.xml
index 93873523ca..820b82f5c0 100644
--- a/FlowCrypt/src/main/res/layout/fragment_edit_contact.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_edit_contact.xml
@@ -57,14 +57,12 @@
 
         <Button
             android:id="@+id/buttonCheck"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
-            android:layout_height="@dimen/default_button_height"
             android:layout_marginBottom="@dimen/default_margin_content"
             android:enabled="false"
             android:text="@string/check"
             android:textColor="@color/white"
-            android:theme="@style/AppWidget.Button.Green.WithDisabled"
             app:layout_constraintBottom_toTopOf="@+id/textView"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
@@ -82,21 +80,19 @@
 
         <Button
             android:id="@+id/buttonLoadFromFile"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:text="@string/load_from_a_file"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintBottom_toTopOf="@+id/buttonLoadFromClipboard"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
 
         <Button
             android:id="@+id/buttonLoadFromClipboard"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginBottom="@dimen/default_margin_content_big"
             android:text="@string/load_from_clipboard"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
diff --git a/FlowCrypt/src/main/res/layout/fragment_find_keys_in_clipboard.xml b/FlowCrypt/src/main/res/layout/fragment_find_keys_in_clipboard.xml
index 362ce640c8..038114c9e8 100644
--- a/FlowCrypt/src/main/res/layout/fragment_find_keys_in_clipboard.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_find_keys_in_clipboard.xml
@@ -33,7 +33,7 @@
 
     <Button
         android:id="@+id/btRetry"
-        style="@style/AppWidget.Button.Green"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content"
@@ -41,7 +41,6 @@
         android:layout_marginEnd="@dimen/default_margin_content"
         android:text="@string/retry"
         android:textAllCaps="true"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/FlowCrypt/src/main/res/layout/fragment_fix_empty_passphrase.xml b/FlowCrypt/src/main/res/layout/fragment_fix_empty_passphrase.xml
index c4c5bf8599..327da02598 100644
--- a/FlowCrypt/src/main/res/layout/fragment_fix_empty_passphrase.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_fix_empty_passphrase.xml
@@ -70,10 +70,9 @@
 
     <Button
         android:id="@+id/btnUpdatePassphrase"
-        style="@style/AppWidget.Button.Green"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="match_parent"
         android:text="@string/check_passphrase"
         android:textAllCaps="true"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="gone" />
 </LinearLayout>
diff --git a/FlowCrypt/src/main/res/layout/fragment_import_additional_private_keys.xml b/FlowCrypt/src/main/res/layout/fragment_import_additional_private_keys.xml
index 1300ee85ef..57517425eb 100644
--- a/FlowCrypt/src/main/res/layout/fragment_import_additional_private_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_import_additional_private_keys.xml
@@ -36,10 +36,9 @@
 
         <Button
             android:id="@+id/buttonImportBackup"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_top_first_button"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
             app:layout_constraintTop_toBottomOf="@+id/textViewTitle"
@@ -47,11 +46,10 @@
 
         <Button
             android:id="@+id/buttonLoadFromFile"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_between_buttons"
             android:text="@string/load_from_a_file"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -60,11 +58,10 @@
 
         <Button
             android:id="@+id/buttonLoadFromClipboard"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_between_buttons"
             android:text="@string/load_from_clipboard"
-            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_import_all_pub_keys_from_source.xml b/FlowCrypt/src/main/res/layout/fragment_import_all_pub_keys_from_source.xml
index 350fb10d19..c75388bd52 100644
--- a/FlowCrypt/src/main/res/layout/fragment_import_all_pub_keys_from_source.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_import_all_pub_keys_from_source.xml
@@ -22,15 +22,13 @@
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@string/parsing_public_keys" />
 
-    <ProgressBar
+    <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/pB"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/default_margin_content"
         android:indeterminate="true"
         android:max="100"
-        android:theme="@style/AppWidget.ProgressBar.Linear.Green"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/FlowCrypt/src/main/res/layout/fragment_import_missing_public_key.xml b/FlowCrypt/src/main/res/layout/fragment_import_missing_public_key.xml
index e44d24d9da..7a4c8ce298 100644
--- a/FlowCrypt/src/main/res/layout/fragment_import_missing_public_key.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_import_missing_public_key.xml
@@ -22,11 +22,10 @@
 
     <Button
         android:id="@+id/buttonLoadFromFile"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_top_first_button"
         android:text="@string/load_from_a_file"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -34,11 +33,10 @@
 
     <Button
         android:id="@+id/buttonLoadFromClipboard"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/load_from_clipboard"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_import_private_keys_during_setup.xml b/FlowCrypt/src/main/res/layout/fragment_import_private_keys_during_setup.xml
index 3268997a08..82cad3f8dc 100644
--- a/FlowCrypt/src/main/res/layout/fragment_import_private_keys_during_setup.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_import_private_keys_during_setup.xml
@@ -22,11 +22,10 @@
 
     <Button
         android:id="@+id/buttonLoadFromFile"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_top_first_button"
         android:text="@string/load_from_a_file"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -34,11 +33,10 @@
 
     <Button
         android:id="@+id/buttonLoadFromClipboard"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/load_from_clipboard"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml b/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml
index 991b33d1ca..e9bfbe120a 100644
--- a/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_import_recipients_from_source.xml
@@ -68,22 +68,20 @@
 
     <Button
         android:id="@+id/btLoadFromFile"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big.Orange"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/load_from_a_file"
-        android:theme="@style/AppWidget.Button.Orange"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toBottomOf="@+id/tILKeyIdOrEmail" />
 
     <Button
         android:id="@+id/btLoadFromClipboard"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big.Orange"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/load_from_clipboard"
-        android:theme="@style/AppWidget.Button.Orange"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toBottomOf="@+id/btLoadFromFile" />
diff --git a/FlowCrypt/src/main/res/layout/fragment_legal.xml b/FlowCrypt/src/main/res/layout/fragment_legal.xml
index 9ddb470eaf..6aeb1c85a4 100644
--- a/FlowCrypt/src/main/res/layout/fragment_legal.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_legal.xml
@@ -10,7 +10,6 @@
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout"
-        style="@style/AppTheme.TabLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@color/colorPrimary"
diff --git a/FlowCrypt/src/main/res/layout/fragment_look_up_pub_keys.xml b/FlowCrypt/src/main/res/layout/fragment_look_up_pub_keys.xml
index a2a357f559..3d8ae06dee 100644
--- a/FlowCrypt/src/main/res/layout/fragment_look_up_pub_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_look_up_pub_keys.xml
@@ -31,7 +31,7 @@
 
     <Button
         android:id="@+id/btnRetry"
-        style="@style/AppWidget.Button.Green"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content"
@@ -39,7 +39,6 @@
         android:layout_marginEnd="@dimen/default_margin_content"
         android:text="@string/retry"
         android:textAllCaps="true"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/FlowCrypt/src/main/res/layout/fragment_main_sign_in.xml b/FlowCrypt/src/main/res/layout/fragment_main_sign_in.xml
index 3b04f8d9f9..54e62e1532 100644
--- a/FlowCrypt/src/main/res/layout/fragment_main_sign_in.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_main_sign_in.xml
@@ -26,7 +26,7 @@
 
         <Button
             android:id="@+id/buttonPrivacy"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:text="@string/privacy"
             app:layout_constraintEnd_toStartOf="@+id/buttonTerms"
             app:layout_constraintStart_toStartOf="parent"
@@ -35,7 +35,7 @@
 
         <Button
             android:id="@+id/buttonTerms"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:text="@string/terms"
             app:layout_constraintEnd_toStartOf="@+id/buttonSecurity"
             app:layout_constraintStart_toEndOf="@+id/buttonPrivacy"
@@ -44,7 +44,7 @@
 
         <Button
             android:id="@+id/buttonSecurity"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:text="@string/security"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/buttonTerms"
@@ -87,27 +87,22 @@
 
         <Button
             android:id="@+id/buttonSignInWithGmail"
-            style="@style/AppWidget.Button.White.ConnectAccount"
-            android:drawableStart="@mipmap/ic_gmail"
+            style="@style/AppWidget.Button.Big.OutlinedWithIcon"
             android:text="@string/continue_with_gmail"
-            android:theme="@style/AppWidget.Button.White.ConnectAccount"
+            app:icon="@mipmap/ic_gmail"
             app:layout_constraintBottom_toTopOf="@+id/buttonOtherEmailProvider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textViewConnectYourEmail"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:layout_constraintLeft_creator="1"
-            tools:layout_constraintRight_creator="1"
-            tools:layout_constraintTop_creator="1" />
+            app:layout_constraintVertical_chainStyle="packed" />
 
         <Button
             android:id="@+id/buttonOtherEmailProvider"
-            style="@style/AppWidget.Button.White.ConnectAccount"
-            android:layout_marginTop="16dp"
-            android:drawableStart="@mipmap/ic_email"
+            style="@style/AppWidget.Button.Big.OutlinedWithIcon"
+            android:layout_marginTop="@dimen/default_margin_content"
+            app:icon="@mipmap/ic_email"
             android:text="@string/other_email_provider"
-            android:theme="@style/AppWidget.Button.White.ConnectAccount"
             app:layout_constraintBottom_toTopOf="@+id/buttonHelp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -116,7 +111,7 @@
 
         <Button
             android:id="@+id/buttonHelp"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:layout_marginBottom="@dimen/default_margin_content"
             android:text="@string/help"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/FlowCrypt/src/main/res/layout/fragment_messages_list.xml b/FlowCrypt/src/main/res/layout/fragment_messages_list.xml
index 45f2707645..901056532a 100644
--- a/FlowCrypt/src/main/res/layout/fragment_messages_list.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_messages_list.xml
@@ -45,8 +45,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
             android:contentDescription="@string/create_new_message"
-            android:src="@mipmap/ic_white_plus"
-            app:backgroundTint="@color/colorPrimary"
+            android:src="@drawable/ic_plus_white_24dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/FlowCrypt/src/main/res/layout/fragment_parse_and_save_pub_keys.xml b/FlowCrypt/src/main/res/layout/fragment_parse_and_save_pub_keys.xml
index 36e34f374d..a7a6da5118 100644
--- a/FlowCrypt/src/main/res/layout/fragment_parse_and_save_pub_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_parse_and_save_pub_keys.xml
@@ -22,9 +22,8 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
-    <ProgressBar
+    <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/pB"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content"
@@ -32,7 +31,6 @@
         android:layout_marginEnd="@dimen/default_margin_content"
         android:indeterminate="true"
         android:max="100"
-        android:theme="@style/AppWidget.ProgressBar.Linear.Green"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -41,13 +39,12 @@
 
     <Button
         android:id="@+id/btImportAll"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginStart="@dimen/default_margin_content_small"
         android:layout_marginTop="@dimen/default_margin_small"
         android:layout_marginEnd="@dimen/default_margin_content_small"
         android:text="@string/import_all"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/FlowCrypt/src/main/res/layout/fragment_parse_pgp_keys_from_source.xml b/FlowCrypt/src/main/res/layout/fragment_parse_pgp_keys_from_source.xml
index b2d6f9a0c7..b096ff0143 100644
--- a/FlowCrypt/src/main/res/layout/fragment_parse_pgp_keys_from_source.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_parse_pgp_keys_from_source.xml
@@ -33,15 +33,13 @@
 
     <Button
         android:id="@+id/btRetry"
-        style="@style/AppWidget.Button.Green"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content"
         android:layout_marginTop="@dimen/default_margin_content"
         android:layout_marginEnd="@dimen/default_margin_content"
         android:text="@string/retry"
-        android:textAllCaps="true"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml b/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml
index 95430fbb2c..902289a7b7 100644
--- a/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml
@@ -40,36 +40,32 @@
 
             <Button
                 android:id="@+id/btnShowPubKey"
-                style="@style/AppWidget.Button.Green"
+                style="@style/AppWidget.Button.Big"
                 android:layout_width="0dp"
                 android:layout_marginTop="@dimen/default_margin_content"
                 android:text="@string/show_public_key"
-                android:textAllCaps="true"
-                android:theme="@style/AppWidget.Button.Green"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
                 app:layout_constraintTop_toBottomOf="@+id/tVHeader" />
 
             <Button
                 android:id="@+id/btnCopyToClipboard"
-                style="@style/AppWidget.Button.Green"
+                style="@style/AppWidget.Button.Big"
                 android:layout_width="0dp"
                 android:layout_marginTop="@dimen/default_margin_content"
                 android:text="@string/copy_to_clipboard"
                 android:textAllCaps="true"
-                android:theme="@style/AppWidget.Button.Green"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
                 app:layout_constraintTop_toBottomOf="@+id/btnShowPubKey" />
 
             <Button
                 android:id="@+id/btnSaveToFile"
-                style="@style/AppWidget.Button.Green"
+                style="@style/AppWidget.Button.Big"
                 android:layout_width="0dp"
                 android:layout_marginTop="@dimen/default_margin_content"
                 android:text="@string/save_to_file"
                 android:textAllCaps="true"
-                android:theme="@style/AppWidget.Button.Green"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
                 app:layout_constraintTop_toBottomOf="@+id/btnCopyToClipboard" />
@@ -178,24 +174,22 @@
 
             <Button
                 android:id="@+id/btnUpdatePassphrase"
-                style="@style/AppWidget.Button.Green"
+                style="@style/AppWidget.Button.Big"
                 android:layout_width="0dp"
                 android:layout_marginTop="@dimen/default_margin_content"
                 android:text="@string/check_passphrase"
                 android:textAllCaps="true"
-                android:theme="@style/AppWidget.Button.Green"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
                 app:layout_constraintTop_toBottomOf="@+id/tILKeyPassword" />
 
             <Button
                 android:id="@+id/btnForgetPassphrase"
-                style="@style/AppWidget.Button.Red"
+                style="@style/AppWidget.Button.Big.Red"
                 android:layout_width="0dp"
                 android:layout_marginTop="@dimen/default_margin_content"
                 android:text="@string/forget_passphrase"
                 android:textAllCaps="true"
-                android:theme="@style/AppWidget.Button.Green"
                 android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -203,12 +197,11 @@
 
             <Button
                 android:id="@+id/btnShowPrKey"
-                style="@style/AppWidget.Button.Red"
+                style="@style/AppWidget.Button.Big.Red"
                 android:layout_width="0dp"
                 android:layout_marginTop="@dimen/default_margin_content"
                 android:text="@string/show_private_key"
                 android:textAllCaps="true"
-                android:theme="@style/AppWidget.Button.Red"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
                 app:layout_constraintTop_toBottomOf="@+id/btnForgetPassphrase" />
diff --git a/FlowCrypt/src/main/res/layout/fragment_private_keys.xml b/FlowCrypt/src/main/res/layout/fragment_private_keys.xml
index 1b560d0fe1..5e3636924d 100644
--- a/FlowCrypt/src/main/res/layout/fragment_private_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_private_keys.xml
@@ -38,8 +38,7 @@
         android:layout_marginEnd="@dimen/fab_margin"
         android:layout_marginBottom="@dimen/fab_margin"
         android:contentDescription="@string/add_new_private_key"
-        android:src="@mipmap/ic_white_plus"
-        app:backgroundTint="@color/colorPrimary"
+        android:src="@drawable/ic_plus_white_24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml b/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
index e12354bf40..6ac678eace 100644
--- a/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
@@ -108,10 +108,9 @@
 
         <Button
             android:id="@+id/btSetPassword"
-            style="@style/AppWidget.Button"
+            style="@style/AppWidget.Button.Big.SilverWithWhiteText"
             android:layout_width="0dp"
             android:text="@string/set_password"
-            android:theme="@style/AppWidget.Button.SilverWithWhiteText"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_recheck_provided_passphrase.xml b/FlowCrypt/src/main/res/layout/fragment_recheck_provided_passphrase.xml
index c53f7e338e..b306dd615e 100644
--- a/FlowCrypt/src/main/res/layout/fragment_recheck_provided_passphrase.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_recheck_provided_passphrase.xml
@@ -63,11 +63,10 @@
 
     <Button
         android:id="@+id/btConfirmPassphrase"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/default_margin_content_big"
         android:text="@string/confirm_pass_phrase"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -75,11 +74,10 @@
 
     <Button
         android:id="@+id/btUseAnotherPassphrase"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big.SilverWithWhiteText"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/use_another_pass_phrase"
-        android:theme="@style/AppWidget.Button.SilverWithWhiteText"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
diff --git a/FlowCrypt/src/main/res/layout/fragment_recipients_list.xml b/FlowCrypt/src/main/res/layout/fragment_recipients_list.xml
index 0671241b28..25ee582ecd 100644
--- a/FlowCrypt/src/main/res/layout/fragment_recipients_list.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_recipients_list.xml
@@ -36,8 +36,7 @@
         android:layout_marginEnd="@dimen/default_margin_content"
         android:layout_marginBottom="@dimen/default_margin_content"
         android:contentDescription="@string/add_new_contact"
-        android:src="@mipmap/ic_white_plus"
-        app:backgroundTint="@color/colorPrimary"
+        android:src="@drawable/ic_plus_white_24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/FlowCrypt/src/main/res/layout/fragment_search_backups_in_email.xml b/FlowCrypt/src/main/res/layout/fragment_search_backups_in_email.xml
index b33a711b49..eff255365a 100644
--- a/FlowCrypt/src/main/res/layout/fragment_search_backups_in_email.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_search_backups_in_email.xml
@@ -22,10 +22,9 @@
 
     <Button
         android:id="@+id/btBackup"
-        style="@style/AppWidget.Button.Green"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/default_margin_content"
-        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toBottomOf="@+id/tVTitle"
diff --git a/FlowCrypt/src/main/res/layout/fragment_send_user_public_key.xml b/FlowCrypt/src/main/res/layout/fragment_send_user_public_key.xml
index 7d133dd583..5b5ef6ebe1 100644
--- a/FlowCrypt/src/main/res/layout/fragment_send_user_public_key.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_send_user_public_key.xml
@@ -44,13 +44,12 @@
 
     <Button
         android:id="@+id/buttonOk"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content_small"
         android:layout_marginEnd="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
-        android:text="@android:string/ok"
-        android:theme="@style/AppWidget.Button.Green" />
+        android:text="@android:string/ok" />
 
 </LinearLayout>
diff --git a/FlowCrypt/src/main/res/layout/fragment_server_settings.xml b/FlowCrypt/src/main/res/layout/fragment_server_settings.xml
index e3a6496d51..cb99a355a1 100644
--- a/FlowCrypt/src/main/res/layout/fragment_server_settings.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_server_settings.xml
@@ -325,11 +325,10 @@
 
             <Button
                 android:id="@+id/buttonCheckAndSave"
-                style="@style/AppWidget.Button"
+                style="@style/AppWidget.Button.Big"
                 android:layout_width="0dp"
                 android:layout_marginTop="@dimen/default_margin_content_big"
                 android:text="@string/check_and_save"
-                android:theme="@style/AppWidget.Button.Green"
                 android:visibility="gone"
                 app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
@@ -338,12 +337,11 @@
 
             <View
                 android:id="@+id/bottom"
-                style="@style/AppWidget.Button"
+                style="@style/AppWidget.Button.Big"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/default_margin_content_big"
                 android:text="@string/try_to_connect"
-                android:theme="@style/AppWidget.Button.Green"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
                 app:layout_constraintTop_toBottomOf="@+id/layoutSmtpPassword" />
diff --git a/FlowCrypt/src/main/res/layout/fragment_user_recoverable_auth_exception.xml b/FlowCrypt/src/main/res/layout/fragment_user_recoverable_auth_exception.xml
index 7486768b3c..1ea01e2a2d 100644
--- a/FlowCrypt/src/main/res/layout/fragment_user_recoverable_auth_exception.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_user_recoverable_auth_exception.xml
@@ -27,7 +27,7 @@
 
         <Button
             android:id="@+id/buttonPrivacy"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:layout_marginTop="0dp"
             android:text="@string/privacy"
             app:layout_constraintEnd_toStartOf="@+id/buttonTerms"
@@ -37,7 +37,7 @@
 
         <Button
             android:id="@+id/buttonTerms"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:layout_marginTop="0dp"
             android:text="@string/terms"
             app:layout_constraintEnd_toStartOf="@+id/buttonSecurity"
@@ -47,7 +47,7 @@
 
         <Button
             android:id="@+id/buttonSecurity"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:layout_marginTop="0dp"
             android:text="@string/security"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
@@ -91,24 +91,22 @@
 
         <Button
             android:id="@+id/buttonReconnect"
-            style="@style/AppWidget.Button.White.ConnectAccount"
+            style="@style/AppWidget.Button.OutlinedButton.Big"
             android:layout_marginBottom="@dimen/default_margin_content"
             android:paddingLeft="0dp"
             android:paddingRight="0dp"
             android:text="@string/reconnect"
-            android:theme="@style/AppWidget.Button.White.ConnectAccount"
             app:layout_constraintBottom_toTopOf="@+id/buttonLogout"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
 
         <Button
             android:id="@+id/buttonLogout"
-            style="@style/AppWidget.Button.White.ConnectAccount"
+            style="@style/AppWidget.Button.OutlinedButton.Big"
             android:layout_marginBottom="@dimen/default_margin_content_big"
             android:paddingLeft="0dp"
             android:paddingRight="0dp"
             android:text="@string/log_out"
-            android:theme="@style/AppWidget.Button.White.ConnectAccount"
             app:layout_constraintBottom_toTopOf="@+id/buttonHelp"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
             app:layout_constraintHorizontal_bias="0.491"
@@ -116,7 +114,7 @@
 
         <Button
             android:id="@+id/buttonHelp"
-            style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
+            style="@style/AppWidget.Button.Big.Transparent.MainScreenTopButton"
             android:layout_marginBottom="@dimen/default_margin_content"
             android:text="@string/help"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/FlowCrypt/src/main/res/layout/import_pgp_contact_item.xml b/FlowCrypt/src/main/res/layout/import_pgp_contact_item.xml
index cfcf0d3b48..79f34526df 100644
--- a/FlowCrypt/src/main/res/layout/import_pgp_contact_item.xml
+++ b/FlowCrypt/src/main/res/layout/import_pgp_contact_item.xml
@@ -38,25 +38,23 @@
 
     <Button
         android:id="@+id/buttonSaveContact"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
         android:text="@string/import_pub_key"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="gone"
         tools:visibility="visible" />
 
     <Button
         android:id="@+id/buttonUpdateContact"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
         android:text="@string/update_pub_key"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/FlowCrypt/src/main/res/layout/message_part_pgp_message_error.xml b/FlowCrypt/src/main/res/layout/message_part_pgp_message_error.xml
index e3f2ba583a..94ee9da420 100644
--- a/FlowCrypt/src/main/res/layout/message_part_pgp_message_error.xml
+++ b/FlowCrypt/src/main/res/layout/message_part_pgp_message_error.xml
@@ -25,12 +25,11 @@ Recusandae velit sit veniam asperiores nisi. Eius tempore ab voluptatum dolorum
 
     <Button
         android:id="@+id/btAction"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
-        android:theme="@style/AppWidget.Button.Green"
         android:visibility="gone"
         tools:text="@string/have_not_any_other_key" />
 </LinearLayout>
diff --git a/FlowCrypt/src/main/res/layout/message_part_pgp_message_missing_private_key.xml b/FlowCrypt/src/main/res/layout/message_part_pgp_message_missing_private_key.xml
index c9f385fcbb..305e0705b7 100644
--- a/FlowCrypt/src/main/res/layout/message_part_pgp_message_missing_private_key.xml
+++ b/FlowCrypt/src/main/res/layout/message_part_pgp_message_missing_private_key.xml
@@ -26,21 +26,19 @@ Recusandae velit sit veniam asperiores nisi. Eius tempore ab voluptatum dolorum
 
     <Button
         android:id="@+id/buttonImportPrivateKey"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
-        android:text="@string/import_missing_key"
-        android:theme="@style/AppWidget.Button.Green" />
+        android:text="@string/import_missing_key" />
 
     <Button
         android:id="@+id/buttonSendOwnPublicKey"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
-        android:text="@string/have_not_any_other_key"
-        android:theme="@style/AppWidget.Button.Green" />
+        android:text="@string/have_not_any_other_key" />
 </LinearLayout>
diff --git a/FlowCrypt/src/main/res/layout/message_part_public_key.xml b/FlowCrypt/src/main/res/layout/message_part_public_key.xml
index 864649cc20..4a65897752 100644
--- a/FlowCrypt/src/main/res/layout/message_part_public_key.xml
+++ b/FlowCrypt/src/main/res/layout/message_part_public_key.xml
@@ -88,12 +88,11 @@
 
     <Button
         android:id="@+id/buttonKeyAction"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Big.Orange"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginBottom="@dimen/default_margin_content_small"
-        android:theme="@style/AppWidget.Button.Orange"
         app:layout_constraintEnd_toEndOf="@+id/textViewFingerprintTemplate"
         app:layout_constraintStart_toStartOf="@+id/textViewFingerprintTemplate"
         app:layout_constraintTop_toBottomOf="@+id/textViewStatus"
diff --git a/FlowCrypt/src/main/res/layout/nav_header.xml b/FlowCrypt/src/main/res/layout/nav_header.xml
index 2df2ea7df6..fa55ecf901 100644
--- a/FlowCrypt/src/main/res/layout/nav_header.xml
+++ b/FlowCrypt/src/main/res/layout/nav_header.xml
@@ -8,8 +8,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
-    android:background="@drawable/side_nav_bar"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
+    android:background="@drawable/side_nav_bar">
 
     <ImageView
         android:id="@+id/imageViewActiveUserPhoto"
@@ -53,6 +52,7 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textColor="@color/white"
                 tools:text="Android Studio" />
 
             <TextView
@@ -61,6 +61,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="middle"
                 android:singleLine="true"
+                android:textColor="@color/aluminum"
                 tools:text="android.studio@android.com" />
         </LinearLayout>
 
diff --git a/FlowCrypt/src/main/res/mipmap-hdpi/ic_white_plus.png b/FlowCrypt/src/main/res/mipmap-hdpi/ic_white_plus.png
deleted file mode 100644
index 4568213204..0000000000
Binary files a/FlowCrypt/src/main/res/mipmap-hdpi/ic_white_plus.png and /dev/null differ
diff --git a/FlowCrypt/src/main/res/mipmap-mdpi/ic_white_plus.png b/FlowCrypt/src/main/res/mipmap-mdpi/ic_white_plus.png
deleted file mode 100644
index 089583af63..0000000000
Binary files a/FlowCrypt/src/main/res/mipmap-mdpi/ic_white_plus.png and /dev/null differ
diff --git a/FlowCrypt/src/main/res/mipmap-xhdpi/ic_white_plus.png b/FlowCrypt/src/main/res/mipmap-xhdpi/ic_white_plus.png
deleted file mode 100644
index 20eeab6464..0000000000
Binary files a/FlowCrypt/src/main/res/mipmap-xhdpi/ic_white_plus.png and /dev/null differ
diff --git a/FlowCrypt/src/main/res/mipmap-xxhdpi/ic_white_plus.png b/FlowCrypt/src/main/res/mipmap-xxhdpi/ic_white_plus.png
deleted file mode 100644
index fdd9e2eb98..0000000000
Binary files a/FlowCrypt/src/main/res/mipmap-xxhdpi/ic_white_plus.png and /dev/null differ
diff --git a/FlowCrypt/src/main/res/mipmap-xxxhdpi/ic_white_plus.png b/FlowCrypt/src/main/res/mipmap-xxxhdpi/ic_white_plus.png
deleted file mode 100644
index 3d733e499c..0000000000
Binary files a/FlowCrypt/src/main/res/mipmap-xxxhdpi/ic_white_plus.png and /dev/null differ
diff --git a/FlowCrypt/src/main/res/values/dimens.xml b/FlowCrypt/src/main/res/values/dimens.xml
index e0f8038428..74ea3d75dc 100644
--- a/FlowCrypt/src/main/res/values/dimens.xml
+++ b/FlowCrypt/src/main/res/values/dimens.xml
@@ -37,7 +37,6 @@
 
     <dimen name="margin_top_main_screen_button">32dp</dimen>
     <dimen name="text_size_logo_crypt">48sp</dimen>
-    <dimen name="drawable_padding_main_screen_sign_button">24dp</dimen>
     <dimen name="padding_left_main_screen_sign_button">24dp</dimen>
     <dimen name="padding_right_main_screen_sign_button">60dp</dimen>
     <dimen name="nav_header_height">160dp</dimen>
diff --git a/FlowCrypt/src/main/res/values/styles.xml b/FlowCrypt/src/main/res/values/styles.xml
index ee63387332..cdd1c1ff7e 100644
--- a/FlowCrypt/src/main/res/values/styles.xml
+++ b/FlowCrypt/src/main/res/values/styles.xml
@@ -7,88 +7,128 @@
 
     <style name="AppWidget" />
 
-    <style name="AppWidget.ActionMode" parent="Base.Widget.AppCompat.ActionMode">
+    <!-- Base widget styles. -->
+    <style name="AppWidget.Button" parent="Widget.Material3.Button">
+        <item name="android:textAllCaps">true</item>
+        <item name="shapeAppearanceOverlay">@style/AppShapeAppearanceOverlay.App.Button</item>
+    </style>
+
+    <style name="AppWidget.AppBarLayout" parent="Widget.Material3.AppBarLayout">
+        <item name="android:background">?attr/colorPrimary</item>
+    </style>
+
+    <style name="AppWidget.Toolbar" parent="Widget.Material3.Toolbar">
+        <item name="titleTextAppearance">@style/AppTextAppearance.Toolbar.Title</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Toolbar</item>
+    </style>
+
+    <style name="AppWidget.TabLayout" parent="Widget.Material3.TabLayout">
+        <item name="tabIndicatorColor">@android:color/white</item>
+        <item name="tabTextAppearance">@style/AppTextAppearance.Design.Tab</item>
+        <item name="tabSelectedTextColor">@android:color/white</item>
+        <item name="tabIndicatorHeight">4dp</item>
+    </style>
+
+    <style name="AppWidget.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
+        <item name="backgroundTint">@color/colorPrimary</item>
+        <item name="tint">@color/white</item>
+    </style>
+
+    <style name="AppWidget.NavigationView" parent="Widget.Material3.NavigationView">
+        <item name="drawerLayoutCornerSize">0dp</item>
+    </style>
+
+    <style name="AppWidget.LinearProgressIndicator" parent="Widget.Material3.LinearProgressIndicator">
+        <item name="trackColor">?attr/colorPrimary</item>
+    </style>
+
+    <style name="AppWidget.ActionMode" parent="Widget.Material3.ActionMode">
         <item name="background">@color/gray</item>
-        <item name="android:background">@color/gray</item>
     </style>
 
-    <style name="AppWidget.Button">
-        <item name="android:layout_height">@dimen/default_button_height</item>
-        <item name="android:textAllCaps">true</item>
+    <!-- Theme Overlay -->
+    <style name="ThemeOverlay" tools:ignore="UnusedResources" />
+
+    <style name="ThemeOverlay.App" tools:ignore="UnusedResources" />
+
+    <style name="ThemeOverlay.App.Button" parent="ThemeOverlay.Material3.Button" tools:ignore="UnusedResources" />
+
+    <style name="ThemeOverlay.App.Button.Orange">
+        <item name="colorContainer">@color/orange</item>
     </style>
 
-    <style name="AppWidget.Button.Green">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="colorButtonNormal">@color/colorPrimary</item>
+    <style name="ThemeOverlay.App.Button.Red">
+        <item name="colorContainer">@color/red</item>
     </style>
 
-    <style name="AppWidget.Button.Orange">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="colorButtonNormal">@color/orange</item>
+    <style name="ThemeOverlay.App.Button.Silver">
+        <item name="colorContainer">@color/silver</item>
     </style>
 
-    <style name="AppWidget.Button.Green.WithDisabled" parent="Widget.MaterialComponents.Button">
-        <item name="colorOnSurface">@color/dark</item>
+    <style name="ThemeOverlay.App.Toolbar" parent="">
+        <item name="colorControlNormal">@color/white</item>
     </style>
 
-    <style name="AppWidget.Button.White">
-        <item name="android:textColor">@color/gray</item>
-        <item name="colorButtonNormal">@color/light</item>
+    <style name="AppShapeAppearanceOverlay" tools:ignore="UnusedResources" />
+
+    <style name="AppShapeAppearanceOverlay.App.Button" parent="ShapeAppearanceOverlay.Material3.Button">
+        <item name="cornerSize">5%</item>
     </style>
 
-    <style name="AppWidget.Button.Red">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="colorButtonNormal">@color/red</item>
+    <!-- Other -->
+    <style name="AppWidget.Button.Big" tools:ignore="UnusedResources">
+        <item name="android:layout_height">@dimen/default_button_height</item>
     </style>
 
-    <style name="AppWidget.Button.SilverWithWhiteText">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="colorButtonNormal">@color/silver</item>
+    <style name="AppWidget.Button.Big.Orange">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button.Orange</item>
     </style>
 
-    <style name="AppWidget.Button.Transparent">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+    <style name="AppWidget.Button.Big.Red">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button.Red</item>
     </style>
 
-    <style name="AppWidget.Button.Transparent.MainScreenTopButton">
-        <item name="android:textColor">@color/dark</item>
-        <item name="android:textSize">@dimen/default_text_size_big</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">@dimen/margin_top_main_screen_button</item>
+    <style name="AppWidget.Button.Big.SilverWithWhiteText">
+        <item name="android:textColor">@android:color/white</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button.Silver</item>
+    </style>
 
+    <style name="AppWidget.Button.OutlinedButton" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/gray</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="shapeAppearanceOverlay">@style/AppShapeAppearanceOverlay.App.Button</item>
     </style>
 
-    <style name="AppWidget.Button.White.ConnectAccount">
+    <style name="AppWidget.Button.OutlinedButton.Big">
+        <item name="android:layout_height">@dimen/default_button_height</item>
+    </style>
+
+    <style name="AppWidget.Button.Big.OutlinedWithIcon" parent="Widget.Material3.Button.OutlinedButton.Icon">
+        <item name="iconTint">@null</item>
+        <item name="iconGravity">start</item>
+        <item name="iconPadding">@dimen/default_margin_content_large</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="shapeAppearanceOverlay">@style/AppShapeAppearanceOverlay.App.Button</item>
+        <item name="android:layout_height">@dimen/default_button_height</item>
         <item name="android:layout_width">@dimen/default_button_width</item>
         <item name="android:paddingLeft">@dimen/padding_left_main_screen_sign_button</item>
         <item name="android:paddingRight">@dimen/padding_right_main_screen_sign_button</item>
-        <item name="android:drawablePadding">@dimen/drawable_padding_main_screen_sign_button</item>
-        <item name="android:gravity">center</item>
         <item name="android:textSize">@dimen/default_text_size_medium</item>
         <item name="android:textColor">@color/dark</item>
     </style>
 
-    <style name="AppWidget.RadioButton" parent="AppTheme">
-        <item name="colorAccent">@color/colorPrimary</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.NoActionBar.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-    <style name="AppTheme.TabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabIndicatorColor">@android:color/white</item>
-        <item name="tabTextAppearance">@style/TabTextAppearance</item>
-        <item name="tabSelectedTextColor">@android:color/white</item>
-        <item name="tabIndicatorHeight">4dp</item>
+    <style name="AppWidget.Button.Big.Transparent">
+        <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 
-    <style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/transparent_white</item>
-        <item name="textAllCaps">false</item>
+    <style name="AppWidget.Button.Big.Transparent.MainScreenTopButton">
+        <item name="android:textColor">@color/dark</item>
+        <item name="android:textSize">@dimen/default_text_size_big</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_top_main_screen_button</item>
     </style>
 
     <style name="ScreenHeading">
@@ -123,18 +163,6 @@
         <item name="android:background">@drawable/bg_message_part_other</item>
     </style>
 
-    <style name="AppWidget.ProgressBar" tools:ignore="UnusedResources" />
-
-    <style name="AppWidget.ProgressBar.Linear" tools:ignore="UnusedResources" />
-
-    <style name="AppWidget.ProgressBar.Linear.Green" parent="AppTheme">
-        <item name="colorAccent">@color/colorPrimary</item>
-    </style>
-
-    <style name="AppWidget.Switch" parent="AppTheme">
-        <item name="colorAccent">@color/colorPrimaryLight</item>
-    </style>
-
     <style name="AppWidget.CheckedTextView" tools:ignore="UnusedResources" />
 
     <style name="AppWidget.CheckedTextView.Password">
@@ -142,4 +170,21 @@
         <item name="android:textColor">@color/orange</item>
         <item name="drawableStartCompat">@drawable/selector_list_item_condition</item>
     </style>
+
+    <!-- Text appearance -->
+    <style name="AppTextAppearance" tools:ignore="UnusedResources" />
+
+    <style name="AppTextAppearance.Toolbar" tools:ignore="UnusedResources" />
+
+    <style name="AppTextAppearance.Toolbar.Title" parent="TextAppearance.Material3.TitleLarge">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="AppTextAppearance.Design" tools:ignore="UnusedResources" />
+
+    <style name="AppTextAppearance.Design.Tab" parent="TextAppearance.Design.Tab">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/transparent_white</item>
+        <item name="textAllCaps">false</item>
+    </style>
 </resources>
diff --git a/FlowCrypt/src/main/res/values/themes.xml b/FlowCrypt/src/main/res/values/themes.xml
index 04ee554c81..1041cc1b9a 100644
--- a/FlowCrypt/src/main/res/values/themes.xml
+++ b/FlowCrypt/src/main/res/values/themes.xml
@@ -5,23 +5,41 @@
 
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
+    <style name="AppTheme" parent="Theme.Material3.Light">
+
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorOutline">@color/aluminum</item>
         <item name="android:windowBackground">@android:color/white</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="actionModeStyle">@style/AppWidget.ActionMode</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+
+        <!-- Widget styles. -->
+        <item name="materialButtonStyle">@style/AppWidget.Button</item>
+        <item name="tabStyle">@style/AppWidget.TabLayout</item>
+        <item name="appBarLayoutStyle">@style/AppWidget.AppBarLayout</item>
+        <item name="toolbarStyle">@style/AppWidget.Toolbar</item>
+        <item name="floatingActionButtonStyle">@style/AppWidget.FloatingActionButton</item>
+        <item name="navigationViewStyle">@style/AppWidget.NavigationView</item>
+        <item name="linearProgressIndicatorStyle">@style/AppWidget.LinearProgressIndicator</item>
+
+        <!-- Action Bars. -->
+        <item name="actionModeStyle">@style/AppWidget.ActionMode</item>
+        <item name="windowActionModeOverlay">true</item>
+
+        <!--we use the following parameters to prevent UI issues after migration to Material 3.0-->
+        <!--Should be removed in the future-->
+        <item name="textInputStyle">@style/Widget.Design.TextInputLayout</item>
     </style>
 
     <style name="AppTheme.Starting" parent="Theme.SplashScreen">
         <!--Set the splash screen background, animated icon, and animation duration.-->
         <item name="windowSplashScreenBackground">@color/white</item>
-        <!--Use windowSplashScreenAnimatedIcon to add either a drawable or an animated drawable. One of these is required.-->
+        <!--Use windowSplashScreenAnimatedIcon to add either a drawable or an animated drawable.-->
+        <!--One of these is required.-->
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
         <!--Set the theme of the Activity that directly follows your splash screen.-->
         <item name="postSplashScreenTheme">@style/AppTheme</item>