diff --git a/app/src/main/res/drawable-v21/background_button_small.xml b/app/src/main/res/drawable-v21/background_button_small.xml
index a1a543eb2..db088c7a2 100644
--- a/app/src/main/res/drawable-v21/background_button_small.xml
+++ b/app/src/main/res/drawable-v21/background_button_small.xml
@@ -8,7 +8,7 @@
             <item android:bottom="2dp" android:left="2dp">
                 <shape>
                     <corners
-                        android:radius="8dp" />
+                        android:radius="@dimen/dialog_radius" />
                     <padding
                         android:left="14dp"
                         android:right="14dp"
diff --git a/app/src/main/res/drawable/background_button_small.xml b/app/src/main/res/drawable/background_button_small.xml
index 3516e7b18..01d009478 100644
--- a/app/src/main/res/drawable/background_button_small.xml
+++ b/app/src/main/res/drawable/background_button_small.xml
@@ -5,7 +5,7 @@
             <item android:bottom="2dp" android:left="2dp">
                 <shape>
                     <corners
-                        android:radius="8dp" />
+                        android:radius="@dimen/dialog_radius" />
                     <padding
                         android:left="14dp"
                         android:right="14dp"
@@ -21,7 +21,7 @@
             <item android:bottom="2dp" android:left="2dp">
                 <shape>
                     <corners
-                        android:radius="8dp" />
+                        android:radius="@dimen/dialog_radius" />
                     <padding
                         android:left="14dp"
                         android:right="14dp"
diff --git a/app/src/main/res/layout/fragment_color_picker.xml b/app/src/main/res/layout/fragment_color_picker.xml
index 091c092ec..120f2f15f 100644
--- a/app/src/main/res/layout/fragment_color_picker.xml
+++ b/app/src/main/res/layout/fragment_color_picker.xml
@@ -36,7 +36,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintEnd_toEndOf="parent" />
-	<androidx.appcompat.widget.SwitchCompat
+	<com.google.android.material.materialswitch.MaterialSwitch
 		android:id="@+id/switch_element"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -44,6 +44,7 @@
 		android:text="@string/enable"
 		android:background="@drawable/background_button_small"
 		android:textColor="?attr/colorOnAccentColor"
+		android:theme="?attr/switchAppearance"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		android:minHeight="48dp"/>
diff --git a/app/src/main/res/values-v21/styles_moon.xml b/app/src/main/res/values-v21/styles_moon.xml
index 40d51ea7b..a6f71dbc5 100644
--- a/app/src/main/res/values-v21/styles_moon.xml
+++ b/app/src/main/res/values-v21/styles_moon.xml
@@ -21,12 +21,14 @@
     <style name="KeepassDXStyle.Blue" parent="KeepassDXStyle.Blue.v21" >
         <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Blue.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Blue.DateTime.Dialog</item>
     </style>
     <style name="KeepassDXStyle.Blue.Night" parent="KeepassDXStyle.Blue.Night.v21" >
         <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Blue.Night.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Blue.Night.DateTime.Dialog</item>
     </style>
diff --git a/app/src/main/res/values-v21/styles_sun.xml b/app/src/main/res/values-v21/styles_sun.xml
index 88f29ba05..3db8f5caa 100644
--- a/app/src/main/res/values-v21/styles_sun.xml
+++ b/app/src/main/res/values-v21/styles_sun.xml
@@ -21,12 +21,14 @@
     <style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Red.v21" >
         <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Red.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Red.DateTime.Dialog</item>
     </style>
     <style name="KeepassDXStyle.Red.Night" parent="KeepassDXStyle.Red.Night.v21" >
         <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Red.Night.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Red.Night.DateTime.Dialog</item>
     </style>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 0cee890ff..9b4b8f5c7 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -19,11 +19,11 @@
 -->
 <resources>
     <style name="KeepassDXStyle.Light.v27" parent="KeepassDXStyle.Light.v23" >
-        <item name="android:navigationBarColor">@color/white_dark</item>
+        <item name="android:navigationBarColor">@color/green_white_dark</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
     <style name="KeepassDXStyle.Night.v27" parent="KeepassDXStyle.Night.v23" >
-        <item name="android:navigationBarColor">@color/grey_dark</item>
+        <item name="android:navigationBarColor">@color/green_black</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f91c16191..b56725db6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -34,5 +34,6 @@
     <dimen name="hidden_lock_button_size">0dp</dimen>
     <dimen name="content_percent">1</dimen>
     <dimen name="toolbar_parallax_height">160dp</dimen>
+    <dimen name="dialog_radius">16dp</dimen>
     <integer name="animation_duration">260</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 88f1ba5fb..02e3cb7b0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -307,11 +307,11 @@
     </style>
     <style name="KeepassDXStyle.Switch.Light" parent="KeepassDXStyle.Light">
         <item name="colorPrimary">@color/orange</item>
-        <item name="colorOnPrimary">@color/green_white_dark</item>
+        <item name="colorOnPrimary">@color/green_white</item>
         <item name="colorOnAccentColor">@color/white</item>
         <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
         <item name="colorOutline">@color/orange</item>
-        <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
+        <item name="colorSurfaceVariant">@color/green_white</item>
     </style>
     <style name="KeepassDXStyle.Switch.Night" parent="KeepassDXStyle.Night">
         <item name="colorPrimary">@color/orange</item>
@@ -403,7 +403,7 @@
         <item name="android:layout_marginLeft">@dimen/card_view_margin_horizontal</item>
         <item name="android:layout_marginRight">@dimen/card_view_margin_horizontal</item>
         <item name="android:padding">@dimen/card_view_padding</item>
-        <item name="cardCornerRadius">16dp</item>
+        <item name="cardCornerRadius">@dimen/dialog_radius</item>
     </style>
     <style name="KeepassDXStyle.Cardview.Light" parent="KeepassDXStyle.Cardview">
         <item name="cardBackgroundColor">@color/green_white</item>