diff --git a/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs b/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs
index 468040b8..d1ad90c1 100644
--- a/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs
+++ b/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs
@@ -17,7 +17,7 @@ namespace keepass2android
 
 		public Drawable Icon
 		{
-			get { return _ctx.Resources.GetDrawable(Android.Resource.Drawable.IcMenuUpload); }
+			get { return _ctx.Resources.GetDrawable(Resource.Drawable.ic_menu_upload_grey); }
 		}
 
 		public string Text
diff --git a/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs b/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs
index 7ca945ed..ae45e3f0 100644
--- a/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs
+++ b/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs
@@ -18,7 +18,7 @@ namespace keepass2android
 
 		public Drawable Icon
 		{
-			get { return _entryActivity.Resources.GetDrawable(Android.Resource.Drawable.IcMenuShare); }
+			get { return _entryActivity.Resources.GetDrawable(Resource.Drawable.ic_menu_share_grey); }
 		}
 
 		public string Text
diff --git a/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs b/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
index 8169fa39..c1044e3c 100644
--- a/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
+++ b/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
@@ -18,7 +18,7 @@ namespace keepass2android
 
 		public Drawable Icon
 		{
-			get { return _activity.Resources.GetDrawable(Android.Resource.Drawable.IcMenuSave); }
+			get { return _activity.Resources.GetDrawable(Resource.Drawable.ic_menu_save_grey); }
 		}
 
 		public string Text
diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs
index 594d29f4..06780ee2 100644
--- a/src/keepass2android/GroupBaseActivity.cs
+++ b/src/keepass2android/GroupBaseActivity.cs
@@ -685,6 +685,7 @@ namespace keepass2android
     public class GroupListFragment : ListFragment, AbsListView.IMultiChoiceModeListener
     {
 	    private ActionMode _mode;
+	    private int _statusBarColor;
 
 	    public override void OnActivityCreated(Bundle savedInstanceState)
         {
@@ -777,6 +778,11 @@ namespace keepass2android
 	        ((PwGroupListAdapter) ListView.Adapter).InActionMode = true;
             ((PwGroupListAdapter)ListView.Adapter).NotifyDataSetChanged();
 	        _mode = mode;
+	        if (Build.VERSION.SdkInt >= BuildVersionCodes.Lollipop)
+	        {
+		        _statusBarColor = Activity.Window.StatusBarColor;
+		        Activity.Window.SetStatusBarColor(Activity.Resources.GetColor(Resource.Color.appAccentColorDark));
+	        }
             return true;
         }
 
@@ -786,6 +792,10 @@ namespace keepass2android
 			((PwGroupListAdapter)ListView.Adapter).InActionMode = true;
             ((PwGroupListAdapter)ListView.Adapter).NotifyDataSetChanged();
 	        _mode = null;
+			if (Build.VERSION.SdkInt >= BuildVersionCodes.Lollipop)
+			{
+				Activity.Window.SetStatusBarColor( new Android.Graphics.Color(_statusBarColor));
+			}
         }
 
         public bool OnPrepareActionMode(ActionMode mode, IMenu menu)
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_close_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_close_grey.png
new file mode 100644
index 00000000..c6cf640b
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_close_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_cut_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_cut_grey.png
new file mode 100644
index 00000000..a3436bda
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_cut_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_delete_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_delete_grey.png
new file mode 100644
index 00000000..e25f9029
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_delete_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_download.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_download.png
new file mode 100644
index 00000000..ff60061a
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_download.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_download_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_download_grey.png
new file mode 100644
index 00000000..bc9c65de
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_download_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_edit_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_edit_grey.png
new file mode 100644
index 00000000..b56f67e0
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_edit_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_lock_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_lock_grey.png
new file mode 100644
index 00000000..b11c0b5e
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_lock_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_navigate_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_navigate_grey.png
new file mode 100644
index 00000000..b98f3759
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_navigate_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_paste_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_paste_grey.png
new file mode 100644
index 00000000..c7ba7612
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_paste_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_save_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_save_grey.png
new file mode 100644
index 00000000..2e2626ad
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_save_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_search_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_search_grey.png
new file mode 100644
index 00000000..9dc364e0
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_search_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_share.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_share.png
new file mode 100644
index 00000000..5933c3a0
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_share.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_share_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_share_grey.png
new file mode 100644
index 00000000..0d87adad
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_share_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_upload.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_upload.png
new file mode 100644
index 00000000..14207152
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_upload.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_upload_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_upload_grey.png
new file mode 100644
index 00000000..eab09b08
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_upload_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_about_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_about_grey.png
new file mode 100644
index 00000000..0c1b795d
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_about_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_changedb_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_changedb_grey.png
new file mode 100644
index 00000000..48bc32ee
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_changedb_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_donate_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_donate_grey.png
new file mode 100644
index 00000000..265fa871
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_donate_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_search_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_search_grey.png
new file mode 100644
index 00000000..584b8db8
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_search_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_settings_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_settings_grey.png
new file mode 100644
index 00000000..8a6ae590
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_settings_grey.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort.png
index 684c5d6e..750d3af1 100644
Binary files a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort.png and b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort.png differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort_grey.png
new file mode 100644
index 00000000..73ed178d
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort_grey.png differ
diff --git a/src/keepass2android/Resources/layout/password.xml b/src/keepass2android/Resources/layout/password.xml
index 426231eb..e33ab160 100644
--- a/src/keepass2android/Resources/layout/password.xml
+++ b/src/keepass2android/Resources/layout/password.xml
@@ -148,6 +148,7 @@
                                 android:id="@+id/password_edit"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
+                                android:minHeight="32dp"
                                 android:paddingTop="2dp"
                                 android:singleLine="true"
                                 android:inputType="textPassword"
@@ -360,21 +361,21 @@
             <Button
                 android:id="@+id/btn_nav_change_db"
                 android:text="@string/menu_change_db"
-                android:drawableLeft="@drawable/ic_nav_changedb"
+                android:drawableLeft="@drawable/ic_nav_changedb_grey"
                 style="@style/NavDrawerButton" />
             <Button
                 android:id="@+id/btn_nav_settings"
-                android:drawableLeft="@drawable/ic_nav_settings"
+                android:drawableLeft="@drawable/ic_nav_settings_grey"
                 android:text="@string/menu_app_settings"
                 style="@style/NavDrawerButton" />
             <Button
                 android:id="@+id/btn_nav_donate"
-                android:drawableLeft="@drawable/ic_nav_donate"
+                android:drawableLeft="@drawable/ic_nav_donate_grey"
                 android:text="@string/menu_donate"
                 style="@style/NavDrawerButton" />
             <Button
                 android:id="@+id/btn_nav_about"
-                android:drawableLeft="@drawable/ic_nav_about"
+                android:drawableLeft="@drawable/ic_nav_about_grey"
                 android:text="@string/menu_about"
                 style="@style/NavDrawerButton" />
         </LinearLayout>
diff --git a/src/keepass2android/Resources/menu/group_entriesselected.xml b/src/keepass2android/Resources/menu/group_entriesselected.xml
index 40c122e2..54defd77 100644
--- a/src/keepass2android/Resources/menu/group_entriesselected.xml
+++ b/src/keepass2android/Resources/menu/group_entriesselected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:id="@+id/menu_edit"
-        android:icon="@android:drawable/ic_menu_edit"
+        android:icon="@drawable/ic_menu_edit"
         android:title="@string/menu_edit"
         android:showAsAction="always"
     />
diff --git a/src/keepass2android/Resources/values/colors.xml b/src/keepass2android/Resources/values/colors.xml
index 2ba442c9..95769f87 100644
--- a/src/keepass2android/Resources/values/colors.xml
+++ b/src/keepass2android/Resources/values/colors.xml
@@ -22,6 +22,7 @@
   <color name="appPrimaryColor">#8bc34a</color>
   <color name="appPrimaryDarkColor">#548a2e</color>
   <color name="appAccentColor">#0277bd</color>
+  <color name="appAccentColorDark">#015080</color>
 
 
 	
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 894cc63e..7e8043d0 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -566,15 +566,12 @@
 	</string>
 
 	<string name="ChangeLog_0_9_8">
-		Version 0.9.8 preview 2 (alpha)\n
-    *** NOTE: This preview is meant for early testing of the new UI design. It is currently not fully functional!***
-    * Material design.
+		Version 0.9.8\n
 		* Support for Storage Access Framework (allows write to SD card and Google Drive in KP2A Offline)\n
 		* Try to detect erroneous user input when entering WebDAV URLs (directory instead of file)\n
 		* Changed password font\n
 		* Allow to change Dropbox account\n
-		* Fixed bug: Now remembering OTP password\n
-		* Note: I have promised Material Design for this release. I am constantly working on it, but it needs a bit more time. Sorry! \n
+		* Fixed bug: Now remembering OTP password
 	</string>
 
 	<string name="ChangeLog_0_9_7b">
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 3a8f3e6c..8fcc7112 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -1328,4 +1328,58 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_view_grey.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_close_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_cut_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_delete_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_download_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_edit_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_lock_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_navigate_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_paste_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_save_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_search_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_share_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_upload_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_nav_about_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_nav_changedb_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_nav_donate_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_nav_search_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_nav_settings_grey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_nav_sort_grey.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file