diff --git a/app/src/main/res/menu/advanced_unlock.xml b/app/src/main/res/menu/advanced_unlock.xml
index ed65272b0..db56f466d 100644
--- a/app/src/main/res/menu/advanced_unlock.xml
+++ b/app/src/main/res/menu/advanced_unlock.xml
@@ -23,5 +23,6 @@
         android:icon="@drawable/ic_keystore_remove_white_24dp"
         android:title="@string/menu_keystore_remove_key"
         android:orderInCategory="85"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/autofill.xml b/app/src/main/res/menu/autofill.xml
index b70d493c6..165097587 100644
--- a/app/src/main/res/menu/autofill.xml
+++ b/app/src/main/res/menu/autofill.xml
@@ -23,5 +23,6 @@
         android:icon="@drawable/ic_block_white_24dp"
         android:title="@string/autofill_block"
         android:orderInCategory="1"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/contribution.xml b/app/src/main/res/menu/contribution.xml
index 5c1671456..535de0089 100644
--- a/app/src/main/res/menu/contribution.xml
+++ b/app/src/main/res/menu/contribution.xml
@@ -23,5 +23,6 @@
         android:icon="@drawable/ic_heart_white_24dp"
         android:title="@string/contribute"
         android:orderInCategory="99"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/database.xml b/app/src/main/res/menu/database.xml
index a7a182b8a..04d881a39 100644
--- a/app/src/main/res/menu/database.xml
+++ b/app/src/main/res/menu/database.xml
@@ -23,10 +23,12 @@
         android:icon="@drawable/ic_save_white_24dp"
         android:title="@string/menu_save_database"
         android:orderInCategory="95"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_reload_database"
         android:icon="@drawable/ic_reload_white_24dp"
         android:title="@string/menu_reload_database"
         android:orderInCategory="96"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/default_menu.xml b/app/src/main/res/menu/default_menu.xml
index 07f675ed7..6e2628794 100644
--- a/app/src/main/res/menu/default_menu.xml
+++ b/app/src/main/res/menu/default_menu.xml
@@ -23,10 +23,12 @@
         android:icon="@drawable/ic_settings_white_24dp"
         android:title="@string/settings"
         android:orderInCategory="91"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_about"
         android:icon="@drawable/ic_help_white_24dp"
         android:title="@string/about"
         android:orderInCategory="101"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/entry.xml b/app/src/main/res/menu/entry.xml
index ee0eb7a0c..e8b3be2d8 100644
--- a/app/src/main/res/menu/entry.xml
+++ b/app/src/main/res/menu/entry.xml
@@ -23,10 +23,12 @@
         android:icon="@drawable/ic_mode_edit_white_24dp"
         android:title="@string/menu_edit"
         android:orderInCategory="22"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_goto_url"
         android:icon="@drawable/ic_launch_white_24dp"
         android:title="@string/menu_url"
         android:orderInCategory="23"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/entry_edit.xml b/app/src/main/res/menu/entry_edit.xml
index 4b542c6a5..76e63cfef 100644
--- a/app/src/main/res/menu/entry_edit.xml
+++ b/app/src/main/res/menu/entry_edit.xml
@@ -25,15 +25,18 @@
         android:icon="@drawable/ic_new_field_white_24dp"
         android:title="@string/entry_add_field"
         android:orderInCategory="92"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always" />
     <item android:id="@+id/menu_add_attachment"
         android:icon="@drawable/ic_attach_file_white_24dp"
         android:title="@string/entry_add_attachment"
         android:orderInCategory="93"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always" />
     <item android:id="@+id/menu_add_otp"
         android:icon="@drawable/ic_otp_white_24dp"
         android:title="@string/entry_setup_otp"
         android:orderInCategory="94"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/entry_history.xml b/app/src/main/res/menu/entry_history.xml
index c4fc8b419..84516a354 100644
--- a/app/src/main/res/menu/entry_history.xml
+++ b/app/src/main/res/menu/entry_history.xml
@@ -23,10 +23,12 @@
         android:icon="@drawable/ic_autorenew_white_24dp"
         android:title="@string/menu_restore_entry_history"
         android:orderInCategory="92"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_delete_entry_history"
         android:icon="@drawable/ic_content_delete_white_24dp"
         android:title="@string/menu_delete_entry_history"
         android:orderInCategory="93"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/node_menu.xml b/app/src/main/res/menu/node_menu.xml
index c5ff3000e..7b4ab114f 100644
--- a/app/src/main/res/menu/node_menu.xml
+++ b/app/src/main/res/menu/node_menu.xml
@@ -24,25 +24,30 @@
         android:icon="@drawable/ic_content_copy_white_24dp"
         android:title="@string/menu_copy"
         android:orderInCategory="1040"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_move"
         android:icon="@drawable/ic_content_cut_white_24dp"
         android:title="@string/menu_move"
         android:orderInCategory="1030"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_delete"
         android:icon="@drawable/ic_content_delete_white_24dp"
         android:title="@string/menu_delete"
         android:orderInCategory="1050"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_open"
         android:icon="@drawable/ic_launch_white_24dp"
         android:title="@string/menu_open"
         android:orderInCategory="1060"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_edit"
         android:icon="@drawable/ic_mode_edit_white_24dp"
         android:title="@string/menu_edit"
         android:orderInCategory="1070"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/node_paste_menu.xml b/app/src/main/res/menu/node_paste_menu.xml
index 7d462805c..66fea87d2 100644
--- a/app/src/main/res/menu/node_paste_menu.xml
+++ b/app/src/main/res/menu/node_paste_menu.xml
@@ -23,5 +23,6 @@
         android:icon="@drawable/ic_content_paste_white_24dp"
         android:title="@string/menu_paste"
         android:orderInCategory="1090"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom|withText" />
 </menu>
diff --git a/app/src/main/res/menu/open_file.xml b/app/src/main/res/menu/open_file.xml
index d3c7a4369..11f3ee674 100644
--- a/app/src/main/res/menu/open_file.xml
+++ b/app/src/main/res/menu/open_file.xml
@@ -23,5 +23,6 @@
         android:icon="@drawable/ic_read_write_white_24dp"
         android:title="@string/menu_open_file_read_and_write"
         android:orderInCategory="85"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/recycle_bin.xml b/app/src/main/res/menu/recycle_bin.xml
index deb567244..fd983c863 100644
--- a/app/src/main/res/menu/recycle_bin.xml
+++ b/app/src/main/res/menu/recycle_bin.xml
@@ -24,5 +24,6 @@
         android:icon="@drawable/ic_delete_forever_white_24dp"
         android:title="@string/menu_empty_recycle_bin"
         android:orderInCategory="35"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index 705250069..b742492f6 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -25,5 +25,6 @@
         app:showAsAction="always|collapseActionView"
         android:orderInCategory="31"
         android:iconifiedByDefault="true"
+        app:iconTint="?attr/colorControlNormal"
         app:actionViewClass="androidx.appcompat.widget.SearchView" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/tree.xml b/app/src/main/res/menu/tree.xml
index 1cc88ebeb..d08354bd2 100644
--- a/app/src/main/res/menu/tree.xml
+++ b/app/src/main/res/menu/tree.xml
@@ -23,5 +23,6 @@
         android:icon="@drawable/ic_sort_white_24dp"
         android:title="@string/sort_menu"
         android:orderInCategory="41"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
new file mode 100644
index 000000000..a45d29099
--- /dev/null
+++ b/app/src/main/res/values-v23/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2019 Jeremy Jamet / Kunzisoft.
+
+ This file is part of KeePassDX.
+
+  KeePassDX is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDX is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources>
+    <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" >
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml
index dd9d3e0fc..267705f64 100644
--- a/app/src/main/res/values/style_white.xml
+++ b/app/src/main/res/values/style_white.xml
@@ -19,7 +19,8 @@
 -->
 <resources>
     <!-- White Style -->
-    <style name="KeepassDXStyle.White" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" />
+    <style name="KeepassDXStyle.White" parent="KeepassDXStyle.Light.WhiteBar.v23" >
         <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryDark">@color/white</item>
         <item name="colorAccent">@color/orange_dark</item>