From f11eabe13f7afb43ef210af6d77df8dca208b1e9 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Thu, 29 Oct 2015 20:31:34 +0100
Subject: [PATCH] fix design issues as requested by Stefano

---
 src/KeePass.sln                               | 596 +++++++++---------
 .../CopyToClipboardPopupMenuIcon.cs           |   2 +-
 .../ToggleVisibilityPopupMenuItem.cs          |   2 +-
 src/keepass2android/GroupActivity.cs          |  11 +-
 src/keepass2android/GroupBaseActivity.cs      |   2 +
 src/keepass2android/PasswordActivity.cs       |   5 +-
 src/keepass2android/QuickUnlock.cs            |   9 +-
 .../drawable-xhdpi/ic_menu_close.png          | Bin 662 -> 15216 bytes
 .../drawable-xhdpi/ic_menu_copy_holo_dark.png | Bin 0 -> 16039 bytes
 .../ic_menu_copy_holo_light.png               | Bin 522 -> 15134 bytes
 .../Resources/drawable-xhdpi/ic_menu_cut.png  | Bin 1110 -> 15961 bytes
 .../drawable-xhdpi/ic_menu_delete.png         | Bin 708 -> 15387 bytes
 .../Resources/drawable-xhdpi/ic_menu_edit.png | Bin 632 -> 15383 bytes
 .../Resources/drawable-xhdpi/ic_menu_lock.png | Bin 971 -> 15873 bytes
 .../drawable-xhdpi/ic_menu_navigate.png       | Bin 16235 -> 16575 bytes
 .../drawable-xhdpi/ic_menu_paste.png          | Bin 678 -> 15211 bytes
 .../Resources/drawable-xhdpi/ic_menu_save.png | Bin 747 -> 15356 bytes
 .../drawable-xhdpi/ic_menu_search.png         | Bin 1035 -> 15562 bytes
 .../drawable-xhdpi/ic_menu_view_grey.png      | Bin 0 -> 16318 bytes
 .../Resources/drawable-xhdpi/ic_nav_about.png | Bin 15952 -> 16262 bytes
 .../drawable-xhdpi/ic_nav_changedb.png        | Bin 15172 -> 15705 bytes
 .../drawable-xhdpi/ic_nav_donate.png          | Bin 15393 -> 16069 bytes
 .../drawable-xhdpi/ic_nav_search.png          | Bin 15509 -> 16132 bytes
 .../drawable-xhdpi/ic_nav_settings.png        | Bin 15532 -> 15624 bytes
 .../Resources/drawable-xhdpi/ic_nav_sort.png  | Bin 15184 -> 15294 bytes
 .../Resources/layout/QuickUnlock.xml          |   1 +
 .../Resources/layout/entry_edit.xml           |  38 +-
 .../Resources/layout/entry_view.xml           |   1 +
 .../Resources/layout/password.xml             |  10 +-
 .../layout/searchurlresults_empty.xml         |   2 +-
 .../Resources/values-de/strings.xml           |   2 +-
 .../Resources/values/strings.xml              |   4 +-
 src/keepass2android/ShareUrlResults.cs        |  12 +-
 src/keepass2android/keepass2android.csproj    |   6 +
 .../pluginhost/PluginDetailsActivity.cs       |   2 +-
 .../pluginhost/PluginListActivity.cs          |   2 +-
 src/keepass2android/search/SearchResults.cs   |  10 +-
 37 files changed, 374 insertions(+), 343 deletions(-)
 create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_menu_copy_holo_dark.png
 create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_menu_view_grey.png

diff --git a/src/KeePass.sln b/src/KeePass.sln
index 50351742..eddc4a16 100644
--- a/src/KeePass.sln
+++ b/src/KeePass.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 2012
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib2Android", "KeePassLib2Android\KeePassLib2Android.csproj", "{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}"
@@ -57,6 +57,144 @@ Global
 		ReleaseNoNet|x64 = ReleaseNoNet|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Win32.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|x64.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Win32.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Win32.ActiveCfg = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|x64.ActiveCfg = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Win32.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Win32.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|x64.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Win32.ActiveCfg = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|x64.ActiveCfg = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Win32.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|x64.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -79,6 +217,162 @@ Global
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Win32.ActiveCfg = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.Build.0 = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.Build.0 = Debug|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Win32.Build.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Win32.Deploy.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|x64.Build.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Win32.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Win32.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Win32.Deploy.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|x64.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|x64.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|x64.Deploy.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Win32.Deploy.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
+		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|x64.Deploy.0 = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Win32.ActiveCfg = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|x64.ActiveCfg = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Win32.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|x64.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Win32.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Win32.ActiveCfg = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -128,264 +422,6 @@ Global
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Win32.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|x64.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Win32.ActiveCfg = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|x64.ActiveCfg = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Win32.ActiveCfg = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|x64.ActiveCfg = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Win32.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Win32.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|x64.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Win32.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|x64.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Win32.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|x64.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Release|x64.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Win32.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|Win32.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Release|x64.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|Win32.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.Release|x64.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{96A3EA5A-7024-479F-A5B1-06654D0867A3}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|Win32.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.Release|x64.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.Build.0 = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.Build.0 = Debug|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -410,45 +446,6 @@ Global
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Win32.Build.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|Win32.Deploy.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|x64.Build.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Win32.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Win32.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|Win32.Deploy.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|x64.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|x64.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.Release|x64.Deploy.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|Win32.Deploy.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
-		{6FF440E6-E8FF-4E43-8221-9E3972F14812}.ReleaseNoNet|x64.Deploy.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5} = {CAC7DBC4-E21F-41E1-B33A-E3A04585F6A3}
@@ -466,4 +463,7 @@ Global
 		$2.inheritsSet = VisualStudio
 		$2.inheritsScope = text/plain
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs b/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
index 96d3120e..937a984b 100644
--- a/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
+++ b/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
@@ -22,7 +22,7 @@ namespace keepass2android
 		{ 
 			get
 			{
-				return _context.Resources.GetDrawable(Resource.Drawable.ic_menu_copy_holo_light);
+				return _context.Resources.GetDrawable(Resource.Drawable.ic_menu_copy_holo_dark);
 			}
 		}
 		public string Text
diff --git a/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs b/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
index bc1af551..a4a77e23 100644
--- a/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
+++ b/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
@@ -21,7 +21,7 @@ namespace keepass2android
 			get
 			{
 				//return new TextDrawable("\uF06E", _activity);
-				return _activity.Resources.GetDrawable(Resource.Drawable.ic_menu_view);
+				return _activity.Resources.GetDrawable(Resource.Drawable.ic_menu_view_grey);
 				
 			}
 		}
diff --git a/src/keepass2android/GroupActivity.cs b/src/keepass2android/GroupActivity.cs
index 16d54ac8..e1cff226 100644
--- a/src/keepass2android/GroupActivity.cs
+++ b/src/keepass2android/GroupActivity.cs
@@ -32,17 +32,8 @@ using Android.Support.V7.App;
 
 namespace keepass2android
 {
-
-
-	//[IntentFilter(new[] { "android.intent.action.SEARCH" })]
-	//[MetaData("android.app.default_searchable", Value = "MaterialTest2.EntryEditActivity")]
-	//[MetaData("android.app.searchable", Resource = "@xml/searchable_mattest")]
-    
 	[Activity(Label = "@string/app_name", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden, Theme = "@style/MyTheme_ActionBar")]
-	//[MetaData("android.app.searchable", Resource = "@xml/searchable_mattest")]
-	//[MetaData("android.app.default_searchable",Value="keepass2android.search.SearchResults")]
-	[IntentFilter(new[] { "android.intent.action.SEARCH" })]
-	[MetaData("android.app.default_searchable", Value = "MaterialTest2.EntryEditActivity")]
+	[MetaData("android.app.default_searchable", Value = "keepass2android.search.SearchResults")]
 #if NoNet
     [MetaData("android.app.searchable", Resource = "@xml/searchable_offline")]
 #else
diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs
index 2e95c164..594d29f4 100644
--- a/src/keepass2android/GroupBaseActivity.cs
+++ b/src/keepass2android/GroupBaseActivity.cs
@@ -393,6 +393,8 @@ namespace keepass2android
 				searchView.SetOnSuggestionListener(new SuggestionListener(searchView.SuggestionsAdapter, this, searchItem));
 				searchView.SetOnQueryTextListener(new OnQueryTextListener(this));
             
+				ActionBar.LayoutParams lparams = new ActionBar.LayoutParams(ActionBar.LayoutParams.MatchParent, ActionBar.LayoutParams.MatchParent);
+				searchView.LayoutParameters = lparams;
 		    
 				var item = menu.FindItem(Resource.Id.menu_sync);
 				if (item != null)
diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 018a6dd3..a941fa7a 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -1053,7 +1053,10 @@ namespace keepass2android
 					OnOk();
 				};
 
-		    FindViewById(Resource.Id.change_db).Click += (sender, args) => GoToFileSelectActivity();
+			string label = FindViewById<Button>(Resource.Id.change_db).Text;
+			if (label.EndsWith("…"))
+				FindViewById<Button>(Resource.Id.change_db).Text = label.Substring(0, label.Length - 1);
+		    FindViewById<Button>(Resource.Id.change_db).Click += (sender, args) => GoToFileSelectActivity();
 		}
 
 		private void OnOk()
diff --git a/src/keepass2android/QuickUnlock.cs b/src/keepass2android/QuickUnlock.cs
index 8705e478..5b726aa6 100644
--- a/src/keepass2android/QuickUnlock.cs
+++ b/src/keepass2android/QuickUnlock.cs
@@ -65,7 +65,14 @@ namespace keepass2android
 			}
 
 			SetContentView(Resource.Layout.QuickUnlock);
-			
+
+			var toolbar = FindViewById<Android.Support.V7.Widget.Toolbar>(Resource.Id.mytoolbar);
+
+			SetSupportActionBar(toolbar);
+
+			var collapsingToolbar = FindViewById<CollapsingToolbarLayout>(Resource.Id.collapsing_toolbar);
+			collapsingToolbar.SetTitle(GetString(Resource.String.QuickUnlock_prefs));
+
 			if (App.Kp2a.GetDb().KpDatabase.Name != "")
 			{
 				FindViewById(Resource.Id.filename_label).Visibility = ViewStates.Visible;
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_close.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_close.png
index 7b2a480a02138f7e1627c47c7810769c07d02987..6e31a0fa4fbfcf8857079e4a03ae3addb81d97d3 100644
GIT binary patch
literal 15216
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
IE?w944>)kc8~^|S

delta 618
zcmV-w0+s#nc9sQ@BsU;qNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzmXvqe*z9kL_t(|+U?s-Zo)7ShGEmHOPU^r7Ljo9P_<k7
zcNi*qfUk=z5KT-x_BWm)&18oZ{5~ioN)QW#>z*6y00&qHIKVo<0oDNyunus5b$|n`
z0~}x--~j6Y2UrKx2Q=Y1tW{dt(1)dXFUYnA9{|3w7VbB{wKxLU<6gF(e{7Kld}0_j
zVaNx7HyI%>pG`RBiwTnaFPsmHaGozDq%ZS|@h}M8C?5cJe86UMp;AH@dDkaCK!Z@6
zFFgx!350wpfJva_%K<C`DL)6mAawZQ<mUlO39<agoR&O534xlQ56C5u^Gg6Z1bTiM
zKuXw7<{wJ(O92vsN`5&Yf0dw=&j6$l)bcriIf7z73vh{`n$H8o3Dfy2*19}EjG&s&
z1*8$E`E0;Eft=3=Tqe--H2`sfLOxU;?k*y)--bJd)##r|d*Ki|V)Ne*p?2m=OefUM
zS0L2RrxSSj(+^4xldlp9+WD)<NtH&>&JPH>1pRzvLXCV?LY;g?e?n=#<aR}cpphTH
zSyUj@%vT}Q%~v4Q&ZiS{^0&p0Xo&=id@8{vpGdIErxEP(Nd(J$3L$-|7lr&dq2~h{
zypQrTe%DPR?6Kqn{t{UEV}c-GdKNknnEB@fQNH{-Fc8@JCxS3P=StjQr;tAodTBnw
z!v9O@00&(6IKX-wC}2GfupS3kj{~g70oLOH>$!TsFR{*3(ZiN^9RL6T07*qoM6N<$
Ef<Hb7;{X5v

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_copy_holo_dark.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_copy_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59716e77458ae591ecdb8bbb43bc439860a919e
GIT binary patch
literal 16039
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

literal 0
HcmV?d00001

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_copy_holo_light.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_copy_holo_light.png
index 557c64f7aa6086d749914ea6040ab36be33d3a2f..e838143ebe399818aa78b49e2afe67bea96a50b8 100644
GIT binary patch
literal 15134
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

delta 477
zcmbPN*2OYG#atoTBgmJ5p-PQ`p`nF=;THpte!;*{YQVtoDuIE)Y6b&?c)^@qfi^%1
zrX+877l!}s{b%-1R1~jgZ1Qw*45_&F_O_$np#XtnAJ?~KShlHWSTramwmvsF_;`nc
zmJt6UZi6@n=a`pG6+EvFJwLQzA?p&K<&{6=%LHEhvAX=-%G0yyQJ*p+LxAvt#S`tO
zXkYnr%Q$N3`)#IITxCQvrY`%xV)KmX3<>{VK|)=7|38}DSjwuG9N$`1SkKs{JLR>-
zGBGWtrnihYIvIg3eBi)XdY*gdz0%b=*>bJ<>)dXx-+s9EL+5(~u9s@*Q|I2Oj;jcZ
z=RPg=X`cA5U7PlZ1L?ZrR~c!cjcU(YU6^-^Wu?WvxVd%0_dOeIva(n|%o6`sA(N*H
zG#UfcBZ(v|*Rb0=F975O82I<rW`pj&Fu9tqKZEP?!W+-K`F**=XOPQc5c%D4Q!#r=
zRjIsnv(etj(1c|hfB)PcIlXQwm&Z!EE2TdFJ)ch#-?$|pzT9uM|Anv1zN`*SsMO`T
va(Sg+R<y<QSs8owReocY-XP3u!E=D$O2_u=l>dkHKo)zt`njxgN@xNAvSh$b

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_cut.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_cut.png
index c9b73421d4f1b6beea29a5cd9b0537be35b586c7..be5d15dac78c6c62c19900693f599da8422f2f52 100644
GIT binary patch
literal 15961
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
UX9i`>AYT3s@(YpV`Yc%WKhi`+*Z=?k

delta 1069
zcmV+|1k(H2eAWn%BsU;qNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzmXvqe*?}*L_t(|+U=Y{PZL2D$6t-11%Y@_JWFW<7l|Lh
z5Iq_b;sGLO4kf@x5LqxGfpEn@O85pQ#6&KJGl+>$<5`ac!~{YC3o(BWc#xgh?R4kO
z+a>PXgiB}U{eR2sbZ6#2&48|V+@KU71xNu>fE2(YZW@(pqi6Jlda0Aze~IXbzEg$P
z={+4MfB^NbB35t;U7TPUU7&cc@Q<4@j|+swIp&Z{DnJ2WVG<SOlL+t-`!J0?^fC+c
z0&^Jx6dI6!iI5kOZwSz0*m<sYq?~|!Lx6ciiCF>pMgT?a$nzN`6wrhw6fuGw?TD0j
zF5fc&SW&8-V%S$EgA&e^e{yAM`8t4h<!kE{kF@Ff6oe{TW##JthLnoKfhk9nvV*en
zbpU0h?*}K%D9^&8tb857mal3lH1Vjf^oFc_9l(LFav?NzxAKK1Dqjb1?yKGunmp?(
zU6Ym14{#wXUkC8R*F-V2fgWG!eOdV?5AjH71LMBZo3ipvhS42le?o@QFTT<XvhsBR
zFO;T&2huU6Y`?609Y7mSe2tx<Ph0she)&os8opAq$=AQkEh`P4q2%jG8H_3Nfi-FQ
zdVnrvD7}0ZM$wHdvgpCM()Z1iv&s*e(99uvc#`si0Gb2uupI)s{NPD_9((Kv4&;X|
ztMoD>IFTQ|u$4!Je-XiRA-~?zVh*#~5s4civV0gU?&eWORh#w@Yb*#B@=X8;gjNh<
z5gXV;4HwwQCKk|-T!fzO@ya&^;2haKPWc=FHVB@5c8S%@AOw#ix5Rp~9>L?uEVCre
zcE4Q$#Dw5>U*#?C;4W5OB5*f&72ysDgbtVg1-BdBnScIXf5s$v()+|VU1${@xQBNx
zp9N0&Q%tkAm;k02C!R3?Of%1&g#o4=O#cM|rX5WG1p!_I?9+dCfHn-Fj4d4C9KZ1s
zpRkAlv>3>rbp3*1;}<%{hr05eza!cDg~H;M#A_ahU#OmZrwBZLAvGrAUf3!y%NJf+
zY_aM*6Y($Zf6iOTe;NPsdQ`tqefdHg9MSzkiP&PY@e3WHIsQ#PJHOEL__tZ@{6cTy
z-{`jU3w?~=YGCIVN`Tqp+S_fez2V8uFO&ewnVnxK0j57Yzfb~fmv(-kf%uKDHh!Th
zZpCjsw($!sCBgh1-7i!_XEN;fQT;+QNjU%!%`dc#Yix3kpfv6m+Qt1O9Rh09FSLsX
zNjrwsh+k-%_3jJ%g=&~#>-*w<p(>Ub22RT>WAw8Ot@QNoaopQPbV%Q*LhH0fC-I-g
n&7{98kpiRuDL@MFUjzIBLCK~r|8(+#00000NkvXXu0mjffSd2g

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_delete.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_delete.png
index c0d2f2fe8ed6e29593e042c0ebc47cedff66dbd7..790971661dd97e9aa9d761bb46e4d63a5cca23e1 100644
GIT binary patch
literal 15387
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

delta 664
zcmV;J0%!f3c*F&eBsU;qNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzmXvqe*!#7L_t(|+U?uBN&`_42H-3xlIIXCY!n-dfQ6UW
z5K;0TUP>E96HR;-8+&`T@C_`p(P*;2RY1bY=3HiX{v&6$T-g0T5_V@{rh!J>M<W3e
zAOR8}0TLhq5`YJA3f~&x4P9*L0{r7ot3VekT7Wai)T0Zb{B%npJ^)<Fe*oGjaASF)
zb4b=0YvF)43IMPo$i@eN%TT~Hz70V>KJXj{_#1x_;R03EM+l%b6Tgg5O?+Sw_6yt^
zE@>jHV#o<-pkqlmsE9BKe+uam1OOSjiiBL^MV8@CjgZT<5_*JOs+r4huR_S>y3q_h
z1;S9WozBp&oiLRB9;lx%f0X{9SvKCLI)XT0Y0iyIgna?RXI+4*2sHw#A=C<}f>1L+
zp72#SK$@TckR_-9Bne6YIl@Q_AVp9F$PiQk5(H&{nXu<T_|^u55(ofc1PVY1fdt@B
z_+bI~5{LkP1S)_JfeheI7_$Lf34{PQ0wutOKngGub`69HE5MdOe+;lAPy=iT1vg+Z
zfgZ4k5CNc^5Cx!|5Cx!&5D8!&A&&<zj}Q?6)`M-dfB*suz?;AW@FXw+ya-$X4+0y&
znZO5dBrpP;2=>-7C&3=@4lokz0S^Ep!5*+>7)T}{xID7@03X2x(8LoT!R@`*M33!{
z<la7QqJvkA#AA-|R)TA+TaVh(F2dQ5+R|?FnFteX$Fzz#J1soHVQjmUe+d&D#kdSQ
yofa-|9P2h~hCT|M#JrB1VJGbqCqM%HbHFcXCv&E=3cy4F0000<MNUMnLSTa3&jCjO

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_edit.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_edit.png
index 9380370f484dac3f00b86319e05b155b26de06b0..df4c4e9914e0d9b66dd3caef9907e98370cb2b73 100644
GIT binary patch
literal 15383
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

delta 588
zcmV-S0<-;>c=!a6BsU;qNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzmXvqe*y4GL_t(|+U?s<O2a@D$MF{x6uJ>lARa_F-oSNF
zV*CREFX3I(y*p1(!2`H*C5($MikM{Hn|YJpZ)9G#oyqspgftY|1*v=X&;bpA4rl;$
zKm(uy8UP*80O)}K16a$Oe9MPC$dPGX;CKyTH!oqOUx^O?n{Onb)5r2ne*|>=c)o$a
zny)7C<|_%z`6>b~|5A~!Ah4f-C;<tu5DusI*uO_UK0M2ToGadUDxEyBJW8A-orMj{
zB{YQhaF#&$;s9(@QwXmNfL*4YaD@l_PP7rOr}xF=+X(&K&ZvAnp`YIym#-uAvE7mR
zaY8h|JRp99oF*vpO9OP@f3o8QReo83_EBw&aG^a4L;g4c46x;A5Loh)2|W2*!m;&e
z{=bb5(kHKdluz>-nonPS<1BdzEuQZS0OWfDAo+d(P`(!cmhS@q=6e93`S}2Fel7r>
zp9jdvzwyb>0Z`<p14!~y0W|q(0HXX909C#nK$dR>(B<0zg!vW#e`UTNK$@=w<mBI$
z%+~>k^ECkK{5XI-KL()Bp9fTsKL@BHe-2PZehI*$`Tl@~^SuF!=lcTgme2PDK=S<n
zpnNX?EZ+wJ%=Z95^Ya1V{9FJ$KMz2Vp97%CPY00X2kF{>>KmW|>YfHbPXnN*0nk%D
a;0J7KV7{)h6?*^x3IG5}MNUMnLSTZaZ3aXD

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_lock.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_lock.png
index a70c55b7eefe17dcdb83689b70a71d493303081f..33aa32f10e08fd47fbb9c49f252656eac8603aba 100644
GIT binary patch
literal 15873
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
MF338#x_s+@0k&kH&j0`b

delta 929
zcmV;S177@re9H%rBsU;qNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzmXvqe*;5FL_t(|+U=UpYZFlr$G=;eCK2kv>Y>{Dqeu#h
zhG-QpQcMn3(5phPVxk72wHN;by?L;$P4ExUvtsL^k>XJ?1R)?u8d8e~o0Hi5Ksp{}
z-zNL(ZT4+sCa0I(c{`u?W@cwzq7nLA2EYIeASHu6S(J-NVhS;gVi>?LfBe8#d_n;q
zvFG{I$lK32J)v#tCR_BFj(Gb-FDE-lIck%YwCFjF1QB4C>SR}T=vJ@*LX;<`vP^?P
z0oX@x$&I|BXb=EGv`TK}wfrt<(xpTmce-5phBE2^MsNxzyWF#ktlBg>+i_(p^iW8b
zW3)ikj`!YF=|YD(WS-wNf7it^LbO1;hWmfg0d)X5gE>_?ZK`pWY6hJ}RRH6L*VZPD
zS!x}nEkUbEhuvEtQ_N)%(v5d<9p5drYPf->?whbwAiHKCFw{JAwsju~nl;k=ccDv$
z%ws>N4;kF(g8wd*6vm7AV_Ub4CE=Tt{|(KQFn;Ao`=u~G?>|6He|YO|JJPPArW;TC
z4=}15l^yGsO=j~2U|2V*JJ#RPjrRKw5E8=DskC&XAwE`N00v+H22djQoB9MYNaC3L
zjBUHntD=Avl)UT*qV$6Nl|5Rah*!rdQM|)t1>UiN8KHM`83WIhm=8?jsTVPjz-MI<
zN=R76g7pq$RHhiDf8|{$sWeL_<z1-N^TcWX^oT5g>K~FdE+rU%0T_S*7=Qs7pbr6x
zxQiIV2xAiWY<IYBdIpP+8`-7X!YmqPsNrfZ>7LkmHQK;ceCXIBu2~hw!Kg+bbTl8>
zz`TlcA#&{d=S)_!h<MO<AZNN5`QT@vg2dH8xKP;i=ccgre^C{;l#+7X^y)<L0nATw
zQo)ab5)xf?G?Z{A=rIsCIS#z<*nB0mP=lsB&UA&E-q%9C$U+gUAtP+PhAdVQ?uSz1
zUo7NNz$SnRq>y&)Jen#1&z6{9WDLLn48Q;kzyJ)O5TLEpzLq>dRVhG49-yEUU|qf+
zh@)s#()LUUUvYeq-GP$#$APwG*~)x-fBK7H4buwDe~)Wk1ToOW401kqW`rd><~#Y@
zWgKZFaiSNExsW(3SV!L4d7J|9o0tI@fB_ibe+2joNpQF7uDe4A00000NkvXXu0mjf
D_9Cnv

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_navigate.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_navigate.png
index ebffce8c55f36431c9b4265b91c3b45159fb03e2..05f8e384009a7207697684ec568746641d835969 100644
GIT binary patch
delta 1390
zcmaD|x4)5bf(4UJ=0>YBW<f&(T_cMSBV#KgLn~toZ3Dx}2boQ=h_bUZ8Wv>am*f{`
z<QG`E<R_QrrskD6<|U^Vm*f`}+i@u%0h^+fG%KgX^vMbA61sL3xdnPDnJHF@sYZ#W
zMwZFC76!(Kx&|gD$+}62#!0%ViOD9WX=&!>$%aXj&v40T19c*qXQPkD-pMsAs=6ko
zNok1&1_rt*7N$nJW`-tax`}2<iMnQ{X=W*@#ztl-2BtRpKxg>+T6s=Z<Ph2Xh~*56
z3NhLyOK_ND35^7f6Pq7#{V}Kya_zm!z`&r8>=ES4z)+>iz|hdl!0_`wkbcR)P-?)y
z@G60U!D<ErgLwX=_@izN49piiT^vIyZoQcko8g}*bKJgueR3|3dACxkW>?Up>01Ks
zecHsmGIn8_nSS7oN!;dLN-b?C3%a8^qq6TMEsCj#t=z33eqxzU&hOn7^XjkuO27U8
z|D57)|Lv{s`>$PFdhW92`R6wI`|nr!Db4gz+H_nXw2{T5VFClEfRF;C6O)RAM*|B7
z=L7~tMj-_i2c{Mlo~*W`fBt=LusjfzU>Cqs!X)3|wm`0ewZyfQu~XuCi#X%&#?V@s
z%dA%z+Z)Y=1mr{y1TIiG`}jU%bVI!wC&#(81#A+t9#-COoa(TdWrwkF1%rsyy#G8A
zJX<owo*X;KFqPlnc3J$aHY)?!2r(zi*Qy74gA#l=o}QV&V7{z1<eUU&LGm0Y!JAK~
zv!qP_t~m9w9%J4e{*|IzJQ}3=-#Te&^a?#Vr|7fg^3?MOG&u{Nixnsx`1#wQ(UOy+
z{y^M=C5I10^Tu4&(Xg0%!0-2Gv);$E8+i}B)X-BC{Ont$dcZ2d(qQ%Rq_@H!Bqj^4
zX5Z&l%E<Y45{rWT<T;XzDvkFYR{xdNwBwk;ty8$y{`ON72LIxZ&uTnQO~3umio?Aq
zw1L05z`gCb`eHu$BWqbrZtmNu%o`}&&^zP0@1FVt?2LDfCzh;Wb^B%Vi+@__fs6-I
z8&2}=nXvfb^Me`-F02cvewKBfVY;e9)iEaVw@IsJOC^Xa?z0m5Zn$9m(cs)ulk4Sf
z@cnt4YPLj7K!|l)_shti&l}cm`((=D?jcyPa=QBd)7xi%^mW*`_RYMh^^C$={~jj?
z%RP&HdYv&<^KQN0(tiJa`ML{EeESLH`fWWw^?i3kQ{1k(Z};);u;bETTlZ)A?Ue}(
zNneE$zU8m=T={2}$?my<d;iQ0{xM;~$}J09qY|RoHqQ-8Xneb@$V}0A0#n=V3yyMX
z3E$W!f6MmYth$B4UNVKJrQzd&tc2EDCH0&C>o@y9%{}wmO21RFK9D=2{U(>y`uUIT
zlHz7qz5BhzXgW(s^0ub5Npr2Z-za=GS;Dd;Aa8lUo(%Ihj|S`D#@z>8j(@g(JEKsW
zk7-c^dkE`_8UyJS{706ux+o@Oa-^O)R%7GLB%{H(u;*ggDJ@36maT8*D>2?wjc3|)
znxC^^vFVbcD3t@f;)<R*Q|cMa*R=<@F@K2CPBiCgv@X+o?=*XElU+D>!TJMUK07Rf
zts3tZuKc5s?s#^FN|krpqisn>@g5EZ?-K1eBc1<0d^&pu|D#xiG#(c>oyMOLagrMZ
zX7q6GsAZhTVBX;V<b#>geO3<t@I%nNf}W8SU^%Jjb3VgTt1DYNzGv_Q%L4{aS3j3^
HP6<r_rwSw>

delta 1043
zcmdnr$oRT$f(4WHf{j*X%z_4%x&{^@hGteK=0K!vU^Mw4vndu)c9zD;fvl1$X$FRd
z#^&Zpx|XKqhPo-{CKkGhMrLNZrYWYWX$C3ghG|AAoBLQ_vJj<m@<R@5E`;@y=d(9W
zZeZuyoWpHx$g*kDzB`jw+vwN3db&7<RNQ(q$2L2}QKEJJ#TFGYHk~H1tmS518|uoq
zxB`_UGWC_BIR7z8b9-h#%=buLn3Vo9JY<otRCg~Yx8Rkn7cvfPoT1%)^xmC2cXxk&
zH@A3}!;RmQZ28}xxij-*;l1i56}ObQSsWNt7zG$S8CV>I7#JsjxgBc_>l36Z7<3r!
zGtB=RbE3|EZtXgC%iLpsmkU17Dqz16`rz~G1GW$BK14HAU9L;uvj}-~^ZNnOgg}N<
zFEu`h+_>o6yZ(UXgQW~Pe(Vk62U6s-wl)gSe%W$`v4`oiYWv*0UkoM<rE8nauC2A3
z&0k=!dNtn-hsO@WGgdA5rnNylBAC6t<hqaRv&mQYu29s77uQ->AII?N>WUrz1Q}0U
zpV#&J{WX<2>m6$fm-D??_g?JPa-IjlN54*IRfu1&z3#sk!>6xDoND)ShJQBtW*MFO
z($~U0`#_HC*7WWf^Q+h!%A6Nx&n=jA^<D5@vx1!~eliJc;h3ZNCgIzn&<8rRZKjDd
zEU2tMwDHO9N$2-7_f3tw#pU4ceW37x+6Ap2KHNJd&b+U)HGHA*!*$+QBo9q1Z7$fc
z$@X?!22*~+@dJw&t(IjpSS8q9Kc$%O{a=fR>-t_7|5Sa@&5*NZ_kp)uuk;w&*VcHR
zp8VmONSngiCKHy@t6pX?Q!cV>$d_Q45yNU3UU%>7z5M#q)7qDtvhzf+p1Cd~aPZH3
zCV}&R`VW*ccBKE)<dW;-c3^#G{e0TWf4@9uF>uY||KQH>Xy*FR31`*|Htd>dAHwh|
z<KG2_6{~+bGcGvyY&Ls9`Db5dkApRv8G;P&7qOpNny@dG;d+C7skuDQ{Eo`^<!Q&Z
zR~g=~ws+id@00(sb@fYU*iHI!&!2Jext&w(&Kquh)37n;&OVkoDlyMztHj*QV>;j1
ze!%#Fc+h<Y9-C+03|3u2pH&$gFDC6{Q7AeS{)%DI|K#Xb`big)_XWLU5H^h0EN|$X
zv3?5UjE<jPk_cv{keT4;sYUE)!U-TH`g=Lu`+j=uWcE2yv-A$*g1Z-1$TF}c?F(XO
zn3xQ-M<eRYbcPZU)o0pYJuUJ(ttQOSXPj_`$8iz^M}rCjlLBW0gNN#ua)w8$;pbgf
R#!Y4b0#8>zmvv4FO#o>8!pi^v

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_paste.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_paste.png
index c74edcf6ce5044f89945fd269ff2d6ec3da224d8..f3a68d20a978f0f75996b000f6f19ccb1dcd045d 100644
GIT binary patch
literal 15211
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

delta 634
zcmaD|wv2Uxin&6vN02WALzNl>LqiJ#!!HIP{epp^)PRBERRRNp)eHs(@q#(K0&Rd2
zOiAAEE)4(M`_Js3s3=~~B<Jbk7*cWT?d|hk(t#puAM~@X9y`dvrQ~riS1@O3w)n-?
zrc5ufqv9EFm%V>*C_KP<#k!U~PUe~1v0AN<=FiY$I_P^*%xmeEgDUamhg{N(jK3e_
z`80Qpn(>_Ky5i?|W*+rvdf{~@fj9F^64L=yzW^t}t?PPRe(!hJ*>v(-Mt#Bj%ir8L
z$N%&Gw=DcmlHR+9?Kv0qqhk7v6|OI=nUrIcTzsbGsM@?kn#Y)Az6<vkCT3r->wbMO
zZNaC;!kin@SMKrnJd)vOl8ZiWQg`Pn&l%<Z{1xSUB=+Ce`Y$5cbKqd{oULyq52YTj
zDGk}sY`OWj!=&9kQpaWXo}8RynKVtT{<BQqE-uxdGcP7zovNKZ;pJrcgZvxZCwuHF
zvUJ;7wn%63`GSNiv3&n_Y+KheuYBI4>>Fxz$vbS8#729kWvj-u=ReXqyXedn-*tvz
zJ)2wKHL_*eWK83e-DjXT|Bv`KcD91rY^mGJ&*hbzn*ZY8Vi$iW21XVE2O#kxl_#RQ
zto|Yohe87b6VZgg`wvy=>l)R5#s1&0y!6`P^A5UU>bs=mJ}8DYOuEkZ{``h#g%Z=l
zwH?nq)Of>Fb8z>KIsbFlfBL&Wt+wNPM2F)~`HezLI~(^$xGg-snt!9k)9|_p?>px|
z5EV0QK4=|pv07u{gW8WQtS|g@K+Y<d&-kBl>sqsp*C$mRfvJbV)78&qol`;+0PL_8
A@Bjb+

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_save.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_save.png
index 51998492cb52124ca6e6990966998dff0f116c0e..f3c85150344b603074e03f517b0e892facb204e1 100644
GIT binary patch
literal 15356
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
B{L26U

delta 703
zcmV;w0zm!zck2a^BsU;qNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzmXvqe*$AkL_t(|+U?uRYZFlv$MJ6zYzpd1SFIKmU9>{z
zA0R>m(Y@Fgu9Vb;iul0CN>{Cl81RXYjYyl;KR`va|A8*liY{tn#f|P%u!6>|B;3ip
z(`4q1{LV6SLeA%M?#-RyPOe6_BPW0W0tg_000IcmPC!4S6zO3_n=3ibf4SBJI=RaJ
z#0E1KAqvpR6SgJV4>1T)fV&Bfer$pp(9erhW@RA34Y<W<N()O6!3}uN=G4~40D>E^
z*!G39B?LF1{z9(BCDvL)unX`cSO$0zYy&(9)&Wfk_5n=@SpY;5vH^%7WCh^-eE|dz
zKmY*}0;C-R2q1s}0tg_0e*gjqAV5|C^Gq_s8@>W-=%dIGJy`)%ImJW%)P1^)0WPr4
zK45|pKOEOqa)&|NfXkd{l5vHjb^#NNcob4$uT4OeK4<g%8>^V5+ah3)DbLIi9@qoS
zv#DX_am8}xSZ@t5#@T@Ei=4Cu*vZp?>|H#v2I%5*Kz26^)&L#+e+tU}DS%q&Kbyqk
zoC(Oj)O633IH1bLfIqSi!5ixYwi3fkdS>q9zQw)J0=<0q$Xm@UT{gGV6^1+tnP!jO
z8=5l5BEOlV%n{qSl+zsGo3nZD#TxyDZ|XmBnhL)gR-R$TV)TAWk5xW0#dBWs1z5{g
zb}+DnClav$=^lJ-eXJ%Q3V6pBLx8vRh5~MK&=BAnheH7cUbg&vMBJ!R;8iFf%>(%L
zah*fXxg7z>^O)@h%Aa93i*W#ur%Wl;Myhdx<L>f(Uc)L-qR0k15??syc*bp4@B0Ic
lhX4WyAb<b@2q3@`;xD;_7!cHx8g&2w002ovPDHLkV1fmaHK70i

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_search.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_search.png
index f7a498f6e76a63bd4b54255362aad6836415c1f2..9cc4bb957f93631d324e966e741163f77256b553 100644
GIT binary patch
literal 15562
zcmeI3dvp_39>*swmbS~Iv@C^+n1&*BX*!cv(`1v-k`x*s^og{V0+Y$49hzjq%=Cpw
z0}FQd$Wc@tt)f&wSN8B&DF>u>g%w=od9)z%SPF^)WqBOS9>mp!ok`Lry|nk}9{-#<
zdHwG9{(irEKfil#=AZdf{_N>PW0PVL1Q}}0wG{H-3x#*|ApSG=<pZt!SBy8eltqx=
zBnWQ_^4iAH2$Fe=DlXwlY_s$P?M}xXw4F?^b9?#T2x6F0=f#OCl9SrW3d&=Y-TB~v
zOiDS7vbh=?X7ifKN-B2=Ll!NWT}&*gB6JSf6jQ9BPR|E$lN>IsbGtmOzRoD~$JO({
zg=SPH^>^W_jIwMYp|r%7FE!H)Db=KB$O$Y%E7j`K6&kHptxc0EF@*-jRHzD*D^+?m
zrdKPa!AoX}<$oC%hf`l@nHEgPTSi$W$9eTAT3cJ2UaLx{nF>^))9Fx5i7J(HzK5Kx
z_i%Wf+{2C!1nG%mAz6Z<yc|V)q(WTWPFHhAnM_F3dj;p^_Vy<7ut9b_MYIn0qKb43
z?a#?U^!j+K8JB-(4gw`zq?`0`Ebpi2*Uwu?b2M8?50J7~9xyRq6Pv9!cfaFxyZcSe
zayd0Tf*{g<J=x-VFNqeCEM3hIWKIn~mGS+}o}-+h;`E6mC<Bh2tfK~S6O@3Pe<=hi
zWZ>tjH!~#8(M&N-yG(&qmfwR=YBu{<m2}cv%HyDG*;E4xx`gT-ibh&+jx-7DQLf+@
zV`i~Jsn@9VSjJ>bp~tYWAc3Ah3>)pBob_M~eoYH6U3iSJo?r}q|2S|C|5;JO`-a7F
z5PB!gxN*)zx$z1T^?E7{Xs9u)XYZ=gn`sx#@WUca3Ip0-bH82|ny40*b+(5fS-u!-
zSdsWr`8V!VyrOSwkKm$Ad{NRJltYh`N?fDV5%Nq-rI2H4H6gd-D!ZJ-3AM)Q)M^QZ
z-GB<)m3In_M2O^X?VBTf0<aMZg}2%CRu9YJ`~<8P|9B{VJX%bF<0@^YT&ciGIj&YK
z<e3DnmD_bnr&38cGDv%-e>L=V4~;Asx+i-uv@q3Q5<1NNk<fVz#UI(YE38is&0mtD
zpD>T4%B6(b)&t;$Y7~)+`?iK^>pxt*IKz^{(P5PJoE^QVG2gZKGWd@mJx&P6vWXCO
zHt8^+eOg1q0^O+pw}658VeSLxsI4SDu#+JW%HM0?AS~_VYH^0luHg5~&pEULQTw`q
z;bHrtZ+&`J?4$KG2&c22Ukm)WaDNT>Q{a)dQ074Y5}~H9YJY#N65}saA$$g1!)4I5
z6z&=>gRUXZIUb5LDTCR7<}feeFC=ij74dgFq$xwAQE3b)*bI8)Q+1@P#6t1s8!N0z
zT}IFc6#8{69mp|E2s#D|7<OOc-%^2A{;r3=;X-@wxE|SUy?f!;{1KYbuNf7HB_;uY
zz)cYsoDZOixBwt<Q^W=51E?Y{00`U^al!cjs)!2!0yjlma6W)4;sSucO%WHI51@*;
z03dKv#0BRAs3I-^2;3BL!TA8HhzkG$H$_}<K7cCX0)W6x5f_{fpo+KvAaGN}1?K~(
zA}#<3+!S%a`2ebj3jhK)MO<(`fGXkwfWS==7n~2EinstEa8twu=L4uBE&vGJ6mh}%
z0IG-!00K8fTyQ>sD&hiwz)cYsoDZOixBwt<Q^W=51E?Y{00`U^al!cjs)!2!0ym+!
zVnfd`k{<rS#ajLe#h3m)?<xN2Mk$e7XhV=C6A;Ar2L$=yA^+WlAk`Rx+*pVp`X&TP
zq+eO^@iYX9oNKjY7uTJ?c|I?9WWm^ji#4{9c3VN@gtulE>?NC5HGXD(I;C8;Vz+s4
zj4V1LwXHbrn?);2HhgAo7_!;CXF1+d-E}FsZEf_<QSrYepE&&S!yj%fbkh&iTRv$0
zvGd@w?1f8rPMmD4r#m+_t2=&rZY$-Bssvwmkjd|Ee$hBHbJ3CF!Cqg*@xPw#nAMi#
zD>@#(AZ8nK_DJS;8`kU_n)>F9eYxA!$D)?XKJWNQ+3btSZ;Z=(+uA-U`9NgLs<ehk
zL)S@05+^%!35lL?=8Y@c)Q^ozSUSwN{{Hj|4H7f!Zm}e*YU#z&C$cu4YIj6jZL+V3
zdFTGR_QlCM-yM#9KIv$5T+8aDlif|9=fsUfRwr!k*xQ-$O!?FCY`5fZuA1#-*_+I_
zO3(Q+n0Zy#I(Gi<@=@87E62>6Gs632cii!bxtcEq9nt3Oet%*D=Dz#op|zu#8T&u|
z*OXHqTIVnRd;G(9M_q18CZ-%(zdHHe7$#{>L_4uRZi?mf-sKkEBnNqF*Racb;^fyp
zY1pLPvOQ7xda=Z^Eq*ip$y+y;ui1Z*`E!b-Gk^38kCp$U%X*a9pVPiB5~FXJMqcf<
z?QDIc;e`AmvoA&BiG6R_+=D}tf83koo1J{-+t~N799%aj4()22+;S0ry(GS+tjRLA
zqVv1%Yt-s*ogF)(S{5`twcUAq1U8LI+jm&G)*3OZXuM^YF5>*k<IfyxPLW)GC9a%Q
z<=ijpEJ|_AU$2QTlWaPY@b$VO=jJb4x#RgG_Y$iSZ|9o#UYx#uHC8oLccR<5rN+0(
zrI452=yLcb6+~Tc>D>L#m}8M=57?iZz5K*~v{}A+7g|SNNW1fPgw%CC=62&c=@=xh
zq;;!mhkC@;$jgz_$JS)F>SnC^YQxmXYzdMzywQEHk*RD+9PNDdtM6rR{w2y+KkfS0
zDbJqEo>0B9<%O5erlrc#7L7_O+_ebVr~Gu<h1)kDM}{;fb$nFbba(i{^J`+S&-~(E
zn-=+F)9tAW<AaE-!>1Fwe~R*DXKa07`>!@{!L8=U3uBS*jmv&d-9Bj@e6#zTS0`RE
zYno<c>95VZH*Wp>4_`ZzV14M>vpjKJ&DAmUcb7FR*)B<H0bi-cWy6tz1=Y8`6=l)F
P)5g}E*_NGC7q0jpeNbGg

delta 994
zcmV<810DRzd5Z{;BsU;qNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzmXvqe*=R_L_t(|+U?uVOB7)o$MHpKEuj?i5UKsVgyyCG
ziNY>!5)pMvF^wYop@p6n_3SAjg9-$VjuJ&69U^~RgP<S;%feEyawXlJeRqhW=9wSQ
z%<Me#49qjv&v$lS%gpm*_SqDvcps?*kN^@u0*D!4OTZ&Cz%lOfo&rHze>Muhc19^(
z%c=%!;{~N{S+#&Wl)h!v0gg}veF^T7VZv%zHGtQkGr>Lb4Rj{BM>arbLiB)u1RVf@
z2zmel5Oe|fCg=n3Nze)4i=Y?42f;nE2|5$>19&9p2=GME6X1cMD?pl{FF=x@GeC-<
zH$Z~m4#<1{P=jd(XrYm6f6}C>rjZPT%wYH+C<ZLh!yemn)zQmGeF0x-XRGV^(sZz_
zBVdeb>EUM=<9Y!$Y4bdfyeRqAC;;R*;cGF{%(@PMO^*9s(Vmp}dO`=Z1$r&g89t!k
z^5|Mu9ipEpmM}0_Vv0Tv+9W5U1bngVc@FT{;)SrmBlcOOYgma6f6#7`KTpm!zs6aM
zims>t3l_uH4cB}6nov{DVl;prA$v}$XFns<-Hrla2y>qOtVscWP;aWNclZ${G{Cgy
z{=}*8no|!L5c(eZ$+98zM?>KO>@KUt!+k8ao2Kek^?*iG?ztzxQ&V-5dVqNd`{W7m
zK^V@I1JZ%k&Kts5e-JakPg8YS^taHW$F=kS)m70y#Lqkdo|vi|)B`f6T#qNfbyIaF
zJb>LGKWNJB^{|(yK%KgQ%nmRkB*&xy4}{uT^#FrfVM_L0>hf2GX<(?6Ir~%h3fa>V
zTXTw>66*TGoK6=VM$@#AzT!eCa!K`q#_57OEb^@m`&(9pf4(b4ip$|HDV+ez?6Rn+
z<)KB7l;^(XYv0fp_0G4%xJ^|p-Apo1jvVt$a#eWb{~VRfgbQ$M9f5aUITJz$<Y^9-
z5IO+XOF-CZOHcrSJe{EtlmGxGsFA+d-Bd~wlmTFcF3Ke~GIz7ej5I+Z0AP_@!fUI4
z=REy<{yQ18e<n;v3-~?Fn`4Mpny8_iGOB1G!w|EkF-49L0YJXV5VQu!5Htta6JEsy
z;6{i6z?l#WfD<7m06W5t_yFt(vD*0RgWw){r*wywXM%fVMDZpwj|BI~QP7zn6B^Z-
zAQP(KrM?6?X9f2Z0}5Oy{oip%c&ngO-QW$w98UhxAe{gbKmter2|(uf1%RcaygJzs
QOaK4?07*qoM6N<$f~8%@82|tP

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_menu_view_grey.png b/src/keepass2android/Resources/drawable-xhdpi/ic_menu_view_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..c40673f0a4e5377316de63c5227a4c97b1671c98
GIT binary patch
literal 16318
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

literal 0
HcmV?d00001

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_about.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_about.png
index 02e4ba1b5ac5093bed41e9e93ecdcd9e46eb04f1..52bc51c0909253f5b19f09511232c6d78259c151 100644
GIT binary patch
delta 1338
zcmcam(^jw88Q|y6%O%Cdz`(%k>ERLtqzyorgAGWAGyQCzs3^hsbEB0hv!J1Yu8~EE
zk+GGD84zh37*1|rHb#h=npzncgG7%on_`M?=3?2-IJujJi{B+bximL5uf#DgIkmVX
zfAU-wgUJ_J#W|AFl2TGr6D=q2VUwF2$0ap+BCC`jn&P73$#QI}Dv4<p76yiCrn+fn
z$;rCrMkdC(mX<*0Sz1~cC#IyCCmI+TO-^T1nS7j8Q6(kKASKnpEJfEmCD}~Z&@k0h
z*CNd_O*h#v+0@j+EYZx&EOjyuP;ob#uues8fnG{xij`4va;kA!s=02G0Z3DtiK(t-
zilMQt1<-UeQ)5FjBeS&0H`wm05T)=oyE!66;GwsQvwm_6m)K-|cGt;&IUI@e6^c=?
zAm6--Q;Lbj#KJ~@@_KI3$#=OGm`p4-|L4xvua7-7MG_d33dtTpz6=aistgPb%?u1b
z{{!il3=E~fxPFzuz+g3lfk8ZfQv6Xj1_ow!PZ!6Kid%1H?avoB6gh4$?kdXd8*yry
z+0;`E$zI3X7#UkPH3YcNxG`DP`CsEd_JDsa3W|>60&fGJEtBTq<w;zbkny>B;o1g+
z2Ojn6r}u5HJ-2k?Cl&3L#qVE#|7vT$Kiyn{hs|eG%8Y`ULK53kp7tql)Fhr~oZe`2
zf$`S?fB6FsOJ{%mp?3O!?8i#k6Poj0GsQRfA7D@5|1o=p?~X_>xfRU02@fvZa<YG)
zwOPASCqU5H>cfRyO!~9g8dV=0nEbHFTHuGW@`g0S*Y&m!v^VJ6)kp5>-5MxxgW;Sq
zn;rYM#`FVCY>PGO?wcLB^}+K2W5F`XH~b%jG$Pm<m_9hYSY2?wp;Vq_n$n$T0ug=^
zP19NX&dpt?syKmlmedDX-!<hEBO8}XE!T8cmu3>>eW7RY*iw6j;Eq)vwe(opG#hxX
z70vkBcEOe{&)uee`sE#$Ju5aFs|JKK{ACN%>5ZRaV0X-BztXXZ$JgB!IFWIwS=ar$
zK`pcM%}YyUC4-q#eRJmdYkJSS{zf=;X2UwU9m`)->!&I5W_Eu}dV5JQBJ|5%&z)g`
zz2RoQ%R?_Nf01ycc!5|H^K7wQuC2VXlT8hl2fW!mMXKxD5hr_r$MvTqiVL$HL?8Fd
zaIhR$ec`_Pf$Y<q7G0bDT^~$Z^#01l{`D>U-dntwf9&S;!oW=v3eMzPy*TdwjN`h4
z=b?y_f`d0q7j!$t@&{%ZFWLRxfYH^rDtF7oTC=W$&)z+L^nbNl*-MT$n!n^C)e4rj
z{QH07#5%#JPFpA3+t~b()mN`XyMArX7QsuIEgn;OzJ}g>Q9e7zWR={G%!C8xnT+|8
z%Pw;KIr7yZ#I-CVVB*y!<_T7xcXh3K95j(JMBl?VM)vB;BX3;or#j3z{pDDR-WBgE
zJ(DS44d<S*_4%FiMfQV9(*6j6{ri1?=aguCSH9yZY8j=}vrXqq)gzs<Dtm!)=islQ
zHO|4luiM=2y*XCpE_TArI&L#xzUKQblOJtq{VzJFSX|Uiy^$8r5>hnv|Mw%750z>k
pwDUjkV4AFU`Ttaj?SG^hj@_O1Y)Y9qFk>(<c)I$ztaD0e0syN63!DG|

delta 1070
zcmZpxzfhyt8Q|y6%O%Cdz`(%k>ERLtq!oZzj)M(I`f|x=PE?d&G}vfm$}DJLscT>o
zVq|P(Y-nX*sBK_0xq;ajENT&AXli9@YGq&w5<S9fiYdC8i)B0G<j-vCyvC-cCTU3)
zNxG(H#)gyi*d!-Auq#cT$0n?jW@v0+Y+#<En`CL6qHC6BVx*gBl4_`%WNeUTnQWP8
zYG|1_`6`>r<Ro_C$t>(*9LC0}$wq03hLbhf<R&j>zY8=WF~!)}(n8lPCB;bB(7?n%
z*U~)AK-bjJBE`taB*`Sn(sHskmpP_iHoxJJW+cu9F#V{$e#22e*^i5B^B=B>j7-Kx
zllythS&R*A^e1oR5#4;BCqkd)%xVMC$<{V{^-QxoT^vIyZatZ9m@zp};CTJSsP<hN
zTx*+}CV1XnI%839v^cvW=Zh7y6*$}~ZMJUX;+!E6xAn%t2QOYt5D7ncki~0B_am(k
z7uJJ%Rx6xi^onXue!utqq7yqm)Azl5%D?}A_wW1Ny*}%&C!448@77WNbx=b1Ry~IX
zQ{@941I9n~Y<A4j4$>Kn_iNnd6dz`+ND+%*N^ARL&L+d)$27fhxr6u)){-(MR_;$}
z#+pjACmVC$W;D=rTb1>;zvTzl1lDiN?2W;ju1%TpWvP~#nsA|l(rTe!`?fS}D$X<B
z^j>`f>mK%blF5C{ryU%Z=7&~HwqWW$Rms1DeM*~!yxRuf`UNa!PT#caIJ!h|2CLSq
zop0t;Pg=HRPO<HRw4R@gU(Sa$gijL6XOYv~`?5H1?cS`lfAiL^J<bp*822Srb4t_V
zLkTTD=FIxlfnFcBrTa$;8mrqSF^VYV%b)rw`@pi`<mA5oi5em`44(wAwWs*)Ylv>F
zT`M8a%uwX@{+CWv_VW71U4ND_Gu+eoyM_P2j!XO5dgcZEa!YtGzSRE*!;AGdUhpy9
zSpFs6j$xxmyNCT7d8uBv4(5#$dzmU$e_6SNL1;p$*0JLZ4P`MqD}p{4F*Z2$^fNN-
zit#!&BiT^YV7c7hhvL#pcYNw&`my9xe#ow<j)sLIHeoIAy87!UU36aAQ=d}#VC$`7
z<y_;SZ|j(~vtG(v;OkAveX#FU$LV7;3>WCd>UBQu`O@B=_0!Sh|GvrvtDf!bk%%%r
zmLhC%o+;bG_ngu;txWYr*%Md3U@EvL@!6^4%EVdsxMe18(m7?9yIpx(P=Ct%7XI>3
z4fi9ShKjt;RE2KO>dL;f<XZ5D{Md7*SAt@FnC`yeDTuJss`Na&!{^kmq)R-pK1ruP
f?B65(PnN;@_SPWQo=<_mB7niu)z4*}Q$iB}GrpQ(

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_changedb.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_changedb.png
index 6800397e197006242d06a411c0e66844abae66a0..bea827d1ca56bceaa9d78c193add62e5bde0c77d 100644
GIT binary patch
delta 1010
zcmX?7cC$*cGr-TCmrII^fq{Y7)59eQNE?7K2OE$KXZqPbQBj=9hJB-zDYKxVfv%B7
zh>@|Ci5U=S8yHS*U^WJeT80=HSQ!{v85@8^k1(5J5#?fO)GElxFUc>?$S<%8Nv$aH
zNvupQDz@WNKms;JDQQ+tiRqJHv$|;`l!KM}CFZ8uW!mUt6P~<~Pgu(aO$KBM77ak*
z$x-YY^)~uY%aELaY&upqBH7`RpIn-onpfhOmz-K$l8?(PNTx$P3ie}8ro3HZN`6wR
zRZ4zxW{MTU=}BoxDXFQ6mXmj}$hm@Cn3IWW1R-~0xNCAfi?K?wNs?KTiFvZFc}lXm
zuAyP7sjfwuWtwiXVX~>Ig;}DRnOW-OYb@p}7DfgsX{pJ{x+azeiMj@fCPuo6=7veS
zmMJNgmMMv8rpCzzlMPvY)soH4O-<4g4M8TF;xN%hf3iQT<mA1qM^sW%Q%y}QjFNOs
zEt3;<O_NPbbraK!Ep!c&&5X^A6AhD$OwA|jaF}DJv(0bWq#22G7fe5DihRpfKiQvy
zYx7@@iHuAp7LzA%nFFcKC%N+VSzNr_3@6)I>DQm}ba4!+xb^0yA>Sbbp4Nx=JroMX
zr*s!F=p8zAWNAQqnSr+?hb+?-MZxovru)5@p0sP-PHWriZRflh7+C}!9Dn-G-!_~{
z?*PY-*|kh-qVBOCVBAqFu!n0AOTj;*8jVFP25VS29H%hs*(mq?^NcE1n<|E&dE1v~
zm+;GcZlBhlbUE$XryARxzt=q%zZtf;g@K7fp#h0#Y*_iU|Ci8#t%(P+x3wM(OS=0t
y=|z%u(%!hztr@@kbwFxATyL-j=G*`OnHl18*St@ZyCMtZGI+ZBxvX<aXaWGz-#};p

delta 583
zcmcavb)-zOGr-TCmrII^fq{Y7)59eQNGkxb90wba^yQM#oTw<yWch2Ol_|5Jfu*j2
zNr;iLm9e3ffuXj6(c}hZW3Z@2h@q*KiKUf^8A$X9vndu)E|$j0GuYHQ%#zIv%*~CB
zCu_3Fu~p<2`1)E+-p?*GnVnr&#oWxyz{DcSP}d+i)l}Co*(6EV!otWv*V4k&GT9>8
z*fPx|X|f%=FNd*lYO+yUq9MqT$s5`4DkmG7n3<abby^sjndlmrnI!5ank5<N8kw70
zq?wr;r<hqz-pFBr#Se{K^^+?(=MZPNC6_s-*ETnDNii`Q8%>_eW6ol1V52{IKac3<
zw>%O0EDkp7^(K4T=+__dba4!+xb<e5E!QCj0k`{X(g*J)zldd#cH}p_ct|?pjAToL
z`A3VFN=u4!l~@c7cmK<I=wrU&@b|W#X_C+Ps;8!?@G(nl6@D(GWW=V{@OtIy(5+pf
zxxdeCoosX7{J_Univyw&t6#m0Z8$C{!`5;CHJ4yyZ3)W(lMD8(9Xah$W_)uRZ39Xf
zkIbkL`%rh!WT($g*6u6WGj6)4Ft8<nP%Xn#ev{L74Y9=*HQF_cKmJkUvG7Vhs=q3#
jTyAOFq5Uj7co{a&G}#>EYWfYBHW)lz{an^LB{Ts5)D5=b

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_donate.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_donate.png
index 907e8f5d6586053ca2cdeb2ec85bc0273777aa60..7d7e669c0ce9fc90e27fc54d705334026dabb2c8 100644
GIT binary patch
delta 1372
zcmZ2jakN&kGr-TCmrII^fq{Y7)59eQNE?7K2OE$KXZqPbQBj=9hJB-zDYKxVfv%B7
zh>@|Ci5U=S8yHS*U^WJeT80=HSQ!{u8C!xxk1(5J5#?fO)GElxFUc>?$S<%8Nv$aH
zNvupQDz@WNKms;JDQQ+tiRqK?vbrHD2P^eU%uTh+w9!YH0vDcaz#*!MCJwR!i*lgw
zWFK~o$$Fe@i9m~xtVcE(tNUyaHn`*`m*%GCl{n@lrxusw<MD=swOwLLep0GcN`7)?
ziWS0$q_m`z)YL>vT~jk-16@PIR8!p~OS4p6OUo2XW0NE^ixi8*$#LvrAeU<6b}5ES
zCf{N)R!K`vN;5LDG}ARtNj8TVZjol0rkiY-Y-(y@mS|>XmO9yxRb}!-7Gae{Lj&_f
zGfQCfnwgvFrka@;fE;0@o0?=|U}0*WXkln#Ir#*O%H&X1;mO}w#MF|_%}q_x5)DD7
zo8mCtMt`zDtK{VMtVdJ~Qqqi!%}rBuO)XL_bj_1Zl5{OCjLdWmjgpPb(kx8V42%pX
z%W;@vrm)TT*`yhXb017UYFfO{RzF#ujcfCJj){y+CKi*MxXgjn=G|QR`YZ;b-?vTH
zv(l?)vhZ|q45_&F=BB@QNTSH`kLP(sPlbA}?NVyW5Zvm?61`QVit*y<jQf5uuIm@N
zzKz|I@m#4nXQg1$k{0W;0&S5jWw&k2OJw%`pLfxHCUbi6^P+R_fAf5vV?X(6<vX3*
ztm${!7@QlXnO*v=aC+0?d$Na<eIALaeGuROkvV=tN4>qO<#B^v_Z_{bA1c%*GJF51
z2$|zN-EZD=_C5W*k65=&oc@C^E@_YdoR1%F`n6izR(zge-@shu&9JUr_+<94?;m_c
z%_Qet?cFS5V#2he^DLVu_xnegAM&~_W;=T8HgreiO)Rl@F?X8tbiqoa134{AHr8&_
zI>2JZ$y8!+arO54c-e}&Bf3Sm%;dIA727nk<@Gfm(FS%-W|>RVzTW#AIZgF${PW6r
zbAP9;o4nzkpJ>C?7RIpE3_5B&8zNW}>=GL)m%i1Mye72fNcPdSkzt+xzsq(;UYs8)
zmEpEw(uJ4nMJ^}LtxS-r=Ipr79VO+PQq0M4W~-#8`-Xz9N8(lD{Pm@b52UX7JN~IU
zu~wJi4tI9{WTE}SMO~~6!4sd|)++vT#qe%MGDC$?LPy?-!~llo77bB(?gRmWsYi~p
zXw(Vs7CiF)oqmWqC&TxRSDpTd$z7AtT+DPp_D{|Zqdm71)cW`WbQ<?x6Zp?-F2(ni
znXy6pM~LH}^qAa@QzaxAVh#oUPCio4@!mspK?cM9FM|Kg{#YxQHYDlPZuS53`h!nS
zL*4A1Gm;-{R`?Tp<m{b~tB-!(FjJa|hp~+z{lq_BhOa;G6diKmhy)gx44$rjF6*2U
FngCB>?yCR*

delta 858
zcmX?FyRbsBGr-TCmrII^fq{Y7)59eQNGkxb90wba^yQM#oTw<yWcg;Jl_|5Jfu*j2
zNr;iLm9e3ffuXj6(c}hZW3Z@2h@q*KiKUf+2}tw^vndu)E|$j0jO>ysh9>4FDJBMH
zy5^~dNxEi+CT6;cCMia`X^Ez$<`${O$p)rrlkM15CeLG2<S;ceH#RV_Fqy2$CdXEh
zTj1+!HF-a~%;fFt!a6{%UP@+)m5EW3VRB+(lCFh;rG;)%l8J?`rJ1FHuAzmwv3aU_
zqOpa6@#OXF_f?2eXvt-c#iNZ}^^+?(=Md+3m=P$Uvbm8<iiyeCX!2Yha~5L*8~w@q
zc|<qA<%!T|F}<i7I@!}kuby$er;B4q#jPjT_hyR(im-mTpOtmc$caPj8dp=oKgQW1
z8^x_ZYHQ>z&QMZH+Nd-`fg?&~n_=UE*47DG+}dl8Hk=g`5}bBK>DZdHu@Oz5%hJt_
zr9Xrfr@xz1{A}-U!}XW4w(?x&libu>Vs$lZ>t)+EV~bmY-`Ra@j!n0XP%o$#axbuW
z_x6Fh-J*+pYp!Pf7rT)7ynuJI<oVYXjYmJ|KM+zgdUQWY?)_wKfik&b3Ewq$Sk67F
z__29~$|Lncsp}urR3C`UD^bjkX8m5A^F1S>{^;^GDtkIUG8O09SQxENSk-c5z89y2
zw&Q^tjjx#5{Tw#4oJ;d^*vrEBbxOlip?Vgb<t#M^q8guMADpO}AnU&|l;LMs!us;n
zO`$dizS&L6XMdKpKGmXsx}hKYR@psVXXgDrpnoQTb2syZ_iV>}5}swb*cWhXGjl|6
z_Vm_SCo*6DC|a4Tc`ujeR+sdSo>rMB>kGF^SI&#vAh<uH*!GCsanYLl?-RF3{{Cqo
z_?g4QTzT7s%pcO<3#6<0Mam1z^Z!e{G~O+LJfvFeU+)?#eJ_XV_4|*0-CgIX_5bh1
foEJ?0_!w@AM{b*;kv18aT^KxF{an^LB{Ts5nwv9i

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_search.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_search.png
index f5e83d3f4bdc71a927382b37115ba4cd645d5c51..2b787ef6ddd741f604cf2bf30d683f4ef7e50e86 100644
GIT binary patch
delta 1435
zcmbPQ*;1$28Q|y6%O%Cdz`(%k>ERLtqzyorgAGWAGyQCzs3^{4!@kkVlv&WwK-b73
z#K_pn#0-eE4GbqYFdHL8O)agA%t4|@m`$;Wa<MdO6=dX><QHe;7g&X)R+RW8R;Cse
z+i@u%0h^+fG%KgX^vQQw-H?=nmHH*-rrKrN=p#&l3r{xS5Y<Ez2U&qdIZ$}A54*->
zJx;bnphZa5Bb$uXeKrUiT=J7kb5rw59P^S>i%atHctgV4E-@uPDb*?^KRGkS3SmT2
zT2e}CYNDmCshP2XuAyP7scw>`S*ot3Ws0S-Ns^gGibdk&ICe3ROSN&k6vHKxZ?PDw
zm>ZfWCnsAZ>zbz|n?nq@NV81SO*Tw6HMKBHG&3_xoovXeGI=74uu7VxiMdItL85M=
zK~kcwd8$dGZc<WOnr>o}MXHf$TB2p5q1ogUEGm;jS%oKmXAx6NHa9mlNlP>YnQn^1
zbQ}H2{;ZOd*Rvi`F}1WvG6I^UYiVSjs%w~N0`#e&iMg&xidmwOg}J$zrMbamISz9~
zs)41j&G*@)8HsZrihg)nyw6rY`7S%x=Jy;E8JSEhCO2`J1F6lsx$^Z{`hqX`OxCl~
zuP^s>aSW-r^=8(2FX=#$_Wg#PElMw!MP{gW9(}hf=jFcNPJ)^7PDx+puHoKT+wA3S
z9wc(m&cQW9oHt2Oq$zdRi_V_Q#*gP(r%&QM+qm1(`1_sDzVGJW->JfJc!K9PNwqu6
z7#?rSx+BQqIPKqN2j&&-NwLh~2Ura@`2Cn~D&1E9aP6}M-UML_rbE`Z6gM!QiDbHS
z%ADCj^abN{zRu&fEibTYJ!Xnvu&Y*)%b%}u&4W>nc{$rj{@a`zY_u9$r#xXlAhv;P
zOXI99eLwD<vi21C?8+PxyzDIBh8G5L-uJF1)qIH*j%27hwP1gvX+Qt<srx=w++D;V
z#ku=zRNvR_>*|kKpWbzJ7gLU!&+I+hRv&pQ%2=>O=Y}hD!?aBs_}4I|O<lhwbp_kD
zsXu(<8)mYs6xjZ~jUj5y^J!UI*8SKg!IZJlY8pf6(eHN!9<)EIHqgybDqH(QPO5KZ
z=gxhq2c|x%&f@ss^Rad_%Z`8=?KXz>BKP;r-S;oM{gmT1BaeNyUG>d8n#|o3gx-JR
zvI=k5$zpi@?8H6G@_xH^?p(-n?a7y2fuG`DnQ=R~W<}&ah&^t4(Qk&C;)dtNd_Sj5
zQP)&`YW6`YLWnbnU5+vT$xVf&W_6aU7S&m@9$F;(JaF;4>sp_K4nOlP^WV3}++|+(
z+Af_p#{EZrZ%Sw{zW00j31)%2^-0x540osgXmmKf{Zw*%N5wuzo0mP)cl&C(SqXaH
z5zpPs|HtR$cgBiEHov*{c)ZFk+?k!~J3szV5?8P2q8x^qil;axa4uTIa84kVt)Owm
zR9OYyM?yR7IT@smES<ya!{s3INbRSR-=jrq+3qmcsm?ue@XLOo;D-M)56(0E{1Pp=
VoNd{=rNHu*!PC{xWt~$(698b;6>tCm

delta 974
zcmZpvn_8*Z8Q|y6%O%Cdz`(%k>ERLtq!oZzj)M(I`f|x=PE-_UvV61A%9L5qz*5)1
zB*e(r%Gl7#z);)3XmSIyF<8_h#L(2r!~!aMgxM5}C>KlPWJY#L6%)fWlSC7<G+k3O
z<7C~GWD|2;OY@XeU1M_-1H-gLv$Ui%lgW1MDwF52DRLMarzRVvB^plFWRqj7$Sv^o
zwVJ%2U1sujc3~YLS1%<q#VW}pIoZM}#X#54(%3-P(#*s_*CNd_RoBAU!ob)hH7PO0
zFlF+3_WLSCDYWD=$KugOuKLN9oO6hCJj@7`P}$tbCB?*KY&3Z;k2#C6fsOv;{XC+Z
z-||H0vwYFs{A9AHjefndr;B4q#jQ8f_j^w%lsO)MUh+x^i+G^f6QRNf36~!17brB1
z$mQizTz>ocw1TYc54N6<u3cI(`NBhySF^mmyEzKITptKDDXf@t`uT&`kM9=O%|E_p
zDZkA5@4xr9pa1>$@1MF!VXIy3m%7Yf`krOo68=dlmRrp?3k9$qYcxy{u&8G$YbZ_d
zyfpnY)3Vrkb1XSHX57^HASm%}VL9)N311!`;+PRB8o{!TtzMqNxBPCvsixfrggvDV
zS*(sV+_z!5&l1OAu4+5w3xfu8e#8BLev%n8Ztk5SVUgTewKtAwA8T4Z!+Mps<%-qP
z5sYqsG9oX1RuWsm_F#781BOZe82lUS_t$+nb4JVcQh`mx`IJU>l{&`Fu_Z3T65LGh
zid(G3tzVpQO}H@M*OOh4W!oOR7ONsbi&K%R?0?t`Vp<OL*|(p0<Hpj+bzxnSeYZda
z|EVvhIhfWrf6WqP@;>-$?(@oJGj19fJiUE*N}mPOy@+cy)$9?5n|IqDkUn5)A2ngi
z-1^<pyL=ep_wMOqxPLb1T5#^^=CzN~=5rk=Z`|JMRd}IC?)TZe(i4*!6&@T)3t{`#
z;D2DtlCX7YPuAUFkYhY8yGE=@o~igiE&G1HD-D&#-bK+0PoH~bDOi3BiT>J{a{K=8
z2M=;18L}3tE@GP$@lpCb^W?i8b8fR%9&ya#yEW~kjZS&Yj{qs}NArD-MylxL>b!Sa
vG*g?q%R^v>ujl*fw1fZsH=mw1nUUdB*A2(}*_AQCEXv^N>gTe~DWM4fV~%l4

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_settings.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_settings.png
index ca9eba344cf39b98f8bbb54b69a92c72729b1536..bb050f5580e22ce02384a393b0bdd8122cf8271d 100644
GIT binary patch
delta 1111
zcmZ2e*-@p~8Q|y6%O%Cdz`(%k>ERLtqzyorgAGWAGyQCzs3^hsW}}rUv!J1Yu8~EE
zk+GGD84zh37*1|rHbxS)v@!;Z9$_}cBFe?mKKU1mu!=>Bp@~IOlBsU8Nm{b5xtWQn
zu7#0#l5VnPvbmXsk!fm*vGHU>R+Y&USrk>0&CN|s(h?1I%~O(1bqx(ufr`^C({z&!
zlTA%6%o5Ga%u**`V^NtL$||f^kz1gbl9^&<X>O35l9p(qn`&%oq-$wlVyJ6rnrg0V
zoMvE@nrM+~Zfsy^qd(c7RdVuP)*~v!D4(puVUFY{sQ)*=Ws_zk&O@mBVIlRFt$wmU
z2iNAm91|ItOe`i(;4%kNn@@7(>$6PQcS~-vjg@}=G*1`DkcwMxW?5&81d1H5U%W1|
zqu*s>O7&4CA#PKJ86AqPD_Re_eK7V=5PQ8?Am@lkRK(2{M;}e9;V={s=D5+R;U*m`
zG%>-XQNmDi_U6{Z7RB$9%{Hg;&v|vv_WA$$JD-=PHyiL|rrmU#?A?7}nYTn+{mR9A
zm=1}|{n~Y1xxR4{Q%&sdTEP#MEqrNPwkH~1P}*>lg)eo>bxZEK%wmm&2?lAk@&)`6
zh8&MXALw0>OwJFesTIEO7rBD>heY8&F$vKJ;Vm&4E8`naAE<jE^+9jbKSzTI;T;nn
z{F%;NARK)?mvc%(YQI8mY2*e8;fh(zA4+SJydJP@n5fJoeW1Qjw~=ASNx>hx{IWS?
zib}pnYB1YQa=g``EYxG_e*3T#Q+k7`H@oNp+l6o5Fs+)l?RvxITM`zTAGc@~{kf#F
zLE$6k3*)m+u?LnM+?Z*e!BEEh+3WWCM&@m;IqU`T50~UzJbEYOhAi{8-x3*@ZnesB
zGwszh6F1o#Ex;<vvhjFDz3tLsU9Sl<Jp?0sBmVP>JmN4p9k6~@{#KT0Mlas;FJGho
zOCf+k&g=CY6>%MoC4ZMmS15EI$y%Vv7<?)ue6rHgskTB(q;5~1bg6e!z<$Sh>$0yd
znBXgMYn^9dsGvlVMA)jJC6ng;Vfp6VziR4^7dHyddQW^cH6)Uyk7+wk-`V~3U-o?C
z@SV87>{qKNkId<t4x9DzFRqwcF-MuHKc{M;-UD~O1Nu8l7C&V<Y;W7-v&r<;rQUZe
z&y?8WnZq0TB<=TGFvK&oJ#EWlsSqyi3@gZ8exB<DSAkYqt$xAr4}34J3!+~+g|IcG
zJLRpIC~t9$_xSlcwGU>T&d5K!?)vO`2Mm7qeEWAl|G@Y3Ymu%D`@eLWXZ#Ic<eJbe
c{KJ?bNM>e)%OcUIz_NnD)78&qol`;+05@i&ZU6uP

delta 1000
zcmeCET2ram8Q|y6%O%Cdz`(%k>ERLtq!oZzj)M(I`f|x=PE?d&{I$`_lv&WgQrEyF
z#K_pn*wD(rP}{(0as#t5SkxlK(A3J*(8|adBzlC|6pJVqOZ((EEQ%_LiH2s$iRPxd
zre?+lx`u|Srn*U%W~sWCmMNCTCP`)%DHe&74OvwtPh=5RF-$Z_H8o1H)J--uG}Sdp
zGD*?3Gy<|L(+tuK%#Biwl1<YlpI}j$9Lg#@`8$i4nz3<evQb*1AwJV>^e6kXN={zS
zdPF7F!qPI$)YL-P$RZ_0*TTreL^sJGF-g}f$<W*|)!ftw=)B2t9OjsQ-+Z4<nvpp7
z!Sths(tWo2$?|Mmo8NOxWMncnn%u-?&SY$`c{f+SK1)U*yWeCzEB$&MPZ!6Kid#>n
z@AnsR6gh5Rov^s&#;h3CBt{qKD+2E`43l`;4mEUc<?a3SZGXZ1jT<*^+wg?TLD<`2
zr$Yzlgc;0QQPPtaD;Ag)pWJos%(*xVgThsJXV$*|{p|0LecJ<9Uwxz$-pL)e_vLhr
zt|C^K6rPC967^gmp<kot^=-LsUH|dG3g>k!cP#q_c&g6j&6&xlRJ4<M!oj9p9hW|4
zJa6dWVU9ka_d)IlLkw#ivp-|}rYjBM2mBvceqfSdatke0pUu3NPc^^6`#|o4xr}zK
zznJ#?VwquZ{^jibzHfKiDkud%6T2I6dDX5D>}kJL`yR_ZU^lp+%FNd=+jG*K9Zm)H
z+ZldHZOEFp+CkOf*{*{T<&px2PVa9>U$tw>$uFJ{lrPLb?tIQD<f@ecw}~y+KPK}{
zrw{bFzdLc_n)B%o!U5+rey&<IRc2M3p`zz{=Y*ip?aeE0T**FMv_(i@QRwM=b<%(4
zziv})mu{EcVkNg=bJk61fr%3pm|aqiP4T?>>2GblVC9p}|IY1<sR^+zX?uMnj(@aW
zaPO&+jQ6A^?;bTynDc^N%yo&dlG5!Ho7i#~emCYsXfn)N_J~(ra4y5=Sf46GiJdNA
zBr7H)ZoE)-=bzo}zWpm+xxDbP;Fn>(-)Q+js(?F!<Au0s!jThaBxR2uIQ^h=g{|Al
zR}+_B$vQBFxyCgxR6aUo-HNQu7eaEF&9l!J|88>*|E#n8QQPyJ_cq5q=}w*yQRidU
it=0YScm3h}%nX9gXH3%@0?z|8FN3G6pUXO@geCys1AR0A

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort.png b/src/keepass2android/Resources/drawable-xhdpi/ic_nav_sort.png
index 358ca35ecb1d743e964eb1c0a3cf3d1fd4250d90..684c5d6e7ce3650ab3da8fad737e579cd13c359d 100644
GIT binary patch
delta 709
zcmcamwy#{VGr-TCmrII^fq{Y7)59eQNE?7K2OE$KXZqPbQBj=9>hMM@Q)WR!16?DF
z5F=wN6Eh&vHZYvrz-){VH8rv_ump)7VK&7g%Ei*?S&)%ml3$#WUtr~upIn-onpfhO
zmz-K$l3!G8$EAP-Y>HCSteg_lQAL3Yz!Eu`lV`Kox`Nc?WTGmu(Z|$jqmRel$uC&c
zluZ-UlFUqvbj{K%40X+tOp<kzk_=LHjZ939P0bCAQq2rZCmXV=OrFT1sA6GilALB}
zX`*YMl5D1HXqalMYmsJ|rkiY-Y-(y@mS|>XmOA+wi^}9sR$;x0+ycFn%oM9cb2Bqb
zv(!{wLsK)LrbH7%-K0bdQ(bfOGy}t=RO1xO<Ww8|$^NX8llQV7Q6Wb8WE~E3L@>jm
zWb<1#8AhV~gQ6WCcW>G1C;M}7ZT`zKk&(&7V)6tob0D?(Bv-yZ%dfOfr^z-}`t_xr
zE{-7;x87Vc<U61sz<jWH%K!SGpBe)u$z0m8B&l_+>fKoN=c^7g1CtQL|7Ug9K1P0g
zcV$JHK3rv6rL~;lNIKsEIsTsAFIK%;E$A=9Hjz=mNQs%Dp>yU9wiz=zLpx4%^qgS$
m&>#-d-=J6tGUY!rgW?_el;?{-Su=101w38-T-G@yGywpb>d!*}

delta 608
zcmdm2exXdUGr-TCmrII^fq{Y7)59eQNGkxb90wba^yQM#oTw<yWch2Ol_|5Jfu*j2
zNr;iLm9e3ffuXj6(c}hZW3Z@2h@q*KsiBpr8A$X9vndu)E|$j0ds)>dzh+UJ%*CcO
zIfGS1IVsI3&D7jb7f2@QCK{NS>RKA7Sn8%FnVT9Vr5G8cSR_xL&#E$6hfR3$IaV<h
zW8>6hqqIarT~jk-16@PIR8!p~OS4p6OUo2XW0NE^ixi8*$=Pi8RZ>$7QVonP(sYfC
zl2ddIO-vGX6OGMNbuA1GQj$}R&5{g^k|yV|n`7~lEoc4Y_ncyry*b*6av#hTlrY$A
z%PGagWNb7!lG~ig*kJP{?tFcg`m3D9lUc3x>o0h^IEGZ*dNWOtkI7KLHNNrc3|khN
zrUJ$zRy^A?bR842cQCWHKVWJRUJy{-Z2F>2WWVM~m6R8gN+!*k_5apBzhg%vPDUyl
zg)^SuGkBSA@tnsX>_k=N`^8V#q!cvPJhPw2kkQ!e6gK;o$zQjWo<Qr|RWEtpbFSH{
z{b0p}t&C}ULhM=zs~7@2Ro^tMW^xEunc}sB;Tu<E^aHiR1#Hu}7`BESVz3cqaGDsP
z^-v~4J7sP|`;kV;4Z#dMmNT$f^3SpV`ZnL)=%T(xawX%B(!J~qYu!E0R(5?!1ST2=
MPgg&ebxsLQ04QC(O#lD@

diff --git a/src/keepass2android/Resources/layout/QuickUnlock.xml b/src/keepass2android/Resources/layout/QuickUnlock.xml
index 09f2defb..02c50c42 100644
--- a/src/keepass2android/Resources/layout/QuickUnlock.xml
+++ b/src/keepass2android/Resources/layout/QuickUnlock.xml
@@ -35,6 +35,7 @@ android:fitsSystemWindows="true">
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/BottomBarButton" 
+        android:singleLine="true" 
         android:id="@+id/QuickUnlock_buttonLock"
         android:layout_alignParentLeft="true"
          />
diff --git a/src/keepass2android/Resources/layout/entry_edit.xml b/src/keepass2android/Resources/layout/entry_edit.xml
index 0e629176..d95bb979 100644
--- a/src/keepass2android/Resources/layout/entry_edit.xml
+++ b/src/keepass2android/Resources/layout/entry_edit.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/entry_scroll"
+    android:background="#ffffffff"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
     <LinearLayout
@@ -66,7 +67,6 @@
                             android:id="@+id/entry_password"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:paddingLeft="0dp"
                             android:paddingTop="0dp"
                             android:singleLine="true"
                             android:inputType="textPassword"
@@ -77,25 +77,24 @@
                         android:layout_height="wrap_content"
                         android:paddingBottom="12dp"
                         android:layout_alignParentRight="true"
-                        android:layout_alignParentBottom="true"
+                        android:layout_centerVertical ="true"
                         android:orientation="horizontal">
                         <ImageButton
                             android:id="@+id/toggle_password"
                             android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
                             android:paddingLeft="8dp"
                             android:paddingRight="8dp"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="bottom"
                             android:src="@drawable/ic_menu_view"
                             android:background="?android:selectableItemBackground" />
                         <ImageButton
                             android:id="@+id/generate_button"
+                            android:layout_gravity="center_vertical"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:paddingLeft="8dp"
                             android:paddingRight="8dp"
-                            android:layout_gravity="bottom"
-                            android:layout_marginBottom="8dp"
                             android:src="@drawable/ic_plus_button"
                             android:background="?android:selectableItemBackground" />
                     </LinearLayout>
@@ -104,7 +103,6 @@
                     android:id="@+id/entry_confpassword"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="0dp"
                     android:paddingTop="0dp"
                     android:singleLine="true"
                     android:inputType="textPassword"
@@ -148,24 +146,29 @@
             <ImageView
                 style="@style/EntryEditSingleLine_ImageView"
                 android:src="@drawable/ic_entry_extras" />
-            <LinearLayout
+          <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
             <!-- Extra strings -->
-                <LinearLayout
+            <LinearLayout
                     android:id="@+id/advanced_container"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical" />
-                <Button
-                    android:id="@+id/add_advanced"
-                    style="@style/EditEntryButton"
-                    android:layout_marginTop="-4dp"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ic_plus_button"
-                    android:text="@string/add_extra_string" />
+              <Button
+                android:id="@+id/add_advanced"
+                android:background="?android:selectableItemBackground"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textAllCaps="true"
+    android:drawableLeft="@drawable/ic_plus_button"
+    android:paddingLeft="8dp"
+    android:layout_width="match_parent"
+    android:layout_weight="1"
+    android:layout_height="wrap_content"
+    android:text="@string/add_extra_string"/>
+                
             </LinearLayout>
         </LinearLayout>
     <!-- file attachments -->
@@ -230,8 +233,6 @@
             style="@style/EntryEditSingleLine_container">
             <ImageView
                 style="@style/EntryEditSingleLine_ImageView"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
                 android:src="@drawable/ic_entry_expires" />
             <LinearLayout
                 android:layout_width="fill_parent"
@@ -252,7 +253,6 @@
                         android:id="@+id/entry_expires_checkbox"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="-8dp"
                         android:layout_gravity="center_vertical" />
                     <EditText
                         android:id="@+id/entry_expires"
diff --git a/src/keepass2android/Resources/layout/entry_view.xml b/src/keepass2android/Resources/layout/entry_view.xml
index 3aab1b45..b2a15016 100644
--- a/src/keepass2android/Resources/layout/entry_view.xml
+++ b/src/keepass2android/Resources/layout/entry_view.xml
@@ -9,6 +9,7 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true"
+        android:background="#ffffffff"
         android:scrollbarStyle="insideOverlay">
         <keepass2android.view.EntryContentsView
             android:id="@+id/entry_contents"
diff --git a/src/keepass2android/Resources/layout/password.xml b/src/keepass2android/Resources/layout/password.xml
index a86edb5a..426231eb 100644
--- a/src/keepass2android/Resources/layout/password.xml
+++ b/src/keepass2android/Resources/layout/password.xml
@@ -107,7 +107,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="vertical"
-                    android:paddingLeft="16dp"
+                    android:paddingLeft="12dp"
                     android:paddingRight="16dp"
                     android:paddingTop="16dp">
                     <TextView
@@ -115,12 +115,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textSize="12sp"
+                        android:layout_marginLeft="4dp"
                         android:text="@string/master_key_type" />
                     <Spinner
                         android:id="@+id/password_mode_spinner"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="-8dp"
+                        android:layout_marginLeft="-4dp"
                         android:entries="@array/password_modes" />
                     <View
                         android:id="@+id/line_below_spinner"
@@ -128,12 +129,14 @@
                         android:layout_width="fill_parent"
                         android:layout_height="1dip"
                         android:layout_marginTop="8dp"
+                        android:layout_marginLeft="4dp"
                         android:layout_centerVertical="true" />
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textSize="12sp"
                         android:layout_marginTop="16dp"
+                        android:layout_marginLeft="4dp"
                         android:text="@string/hint_login_pass" />
                     <RelativeLayout
                         android:layout_width="match_parent"
@@ -145,8 +148,7 @@
                                 android:id="@+id/password_edit"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:paddingLeft="0dp"
-                                android:paddingTop="0dp"
+                                android:paddingTop="2dp"
                                 android:singleLine="true"
                                 android:inputType="textPassword"
                                 android:fontFamily="sans-serif"
diff --git a/src/keepass2android/Resources/layout/searchurlresults_empty.xml b/src/keepass2android/Resources/layout/searchurlresults_empty.xml
index 4ea53905..4bff1331 100644
--- a/src/keepass2android/Resources/layout/searchurlresults_empty.xml
+++ b/src/keepass2android/Resources/layout/searchurlresults_empty.xml
@@ -13,7 +13,7 @@
       android:id="@+id/bottom_bar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:orientation="horizontal"
+      android:orientation="vertical"
       android:layout_alignParentBottom="true"
       android:baselineAligned="false">
     <Button
diff --git a/src/keepass2android/Resources/values-de/strings.xml b/src/keepass2android/Resources/values-de/strings.xml
index 9511f075..4ec97d06 100644
--- a/src/keepass2android/Resources/values-de/strings.xml
+++ b/src/keepass2android/Resources/values-de/strings.xml
@@ -263,7 +263,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="field_name">Feldname</string>
   <string name="field_value">Feldwert</string>
   <string name="protection">Geschütztes Feld</string>
-  <string name="add_binary">Dateianhang hinzufügen...</string>
+  <string name="add_binary">Dateianhang dazu</string>
   <string name="add_extra_string">Zusätzliches Feld hinzufügen</string>
   <string name="delete_extra_string">Zusätzliches Feld löschen</string>
   <string name="database_loaded_quickunlock_enabled">%1$s: gesperrt. QuickUnlock aktiviert.</string>
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 6d384323..894cc63e 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -165,7 +165,7 @@
   <string name="menu_search">Search</string>
   <string name="menu_search_advanced">Advanced Search</string>
   <string name="menu_url">Go to URL</string>
-	<string name="menu_change_db">Change database…</string>
+	<string name="menu_change_db">Change database</string>
   <string name="minus">Minus</string>
   <string name="never">Never</string>
   <string name="yes">Yes</string>
@@ -281,7 +281,7 @@
   <string name="field_name">Field Name</string>
   <string name="field_value">Field value</string>
   <string name="protection">Protected field</string>
-  <string name="add_binary">Add file attachment...</string>
+  <string name="add_binary">Add file attachment</string>
   <string name="add_extra_string">Add additional string</string>
 	<string name="delete_extra_string">Delete additional string</string>
 	<string name="database_loaded_quickunlock_enabled">%1$s: Locked. QuickUnlock enabled.</string>
diff --git a/src/keepass2android/ShareUrlResults.cs b/src/keepass2android/ShareUrlResults.cs
index bf33c902..ef822c03 100644
--- a/src/keepass2android/ShareUrlResults.cs
+++ b/src/keepass2android/ShareUrlResults.cs
@@ -30,7 +30,17 @@ using KeePassLib.Utility;
 namespace keepass2android
 {
     [Activity(Label = "@string/kp2a_findUrl", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden, Theme = "@style/MyTheme_ActionBar")]
-	[MetaData("android.app.default_searchable", Value = "keepass2android.search.SearchResults")]	
+#if NoNet
+    [MetaData("android.app.searchable", Resource = "@xml/searchable_offline")]
+#else
+#if DEBUG
+	[MetaData("android.app.searchable", Resource = "@xml/searchable_debug")]
+#else
+    [MetaData("android.app.searchable", Resource = "@xml/searchable")]
+#endif
+#endif
+	[MetaData("android.app.default_searchable", Value = "keepass2android.search.SearchResults")]
+	[IntentFilter(new[] { Intent.ActionSearch }, Categories = new[] { Intent.CategoryDefault })]
 	public class ShareUrlResults : GroupBaseActivity
 	{
 
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 40fd023f..3a8f3e6c 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -1322,4 +1322,10 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\splashlogo_offline.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_copy_holo_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_view_grey.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/keepass2android/pluginhost/PluginDetailsActivity.cs b/src/keepass2android/pluginhost/PluginDetailsActivity.cs
index cbae8c31..c9c52772 100644
--- a/src/keepass2android/pluginhost/PluginDetailsActivity.cs
+++ b/src/keepass2android/pluginhost/PluginDetailsActivity.cs
@@ -19,7 +19,7 @@ using keepass2android.views;
 
 namespace keepass2android
 {
-	[Activity(Label = AppNames.AppName)]
+	[Activity(Label = AppNames.AppName, Theme = "@style/android:Theme.Material.Light")]
 	[IntentFilter(new[] { Strings.ActionEditPluginSettings },
 		Label = AppNames.AppName,
 		Categories = new[] { Intent.CategoryDefault })]
diff --git a/src/keepass2android/pluginhost/PluginListActivity.cs b/src/keepass2android/pluginhost/PluginListActivity.cs
index 6e2bdfaa..1e9dcd73 100644
--- a/src/keepass2android/pluginhost/PluginListActivity.cs
+++ b/src/keepass2android/pluginhost/PluginListActivity.cs
@@ -9,7 +9,7 @@ using Keepass2android.Pluginsdk;
 
 namespace keepass2android
 {
-	[Activity(Label = "@string/plugins", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden)]
+	[Activity(Label = "@string/plugins", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden, Theme="@style/android:Theme.Material.Light")]
 	[IntentFilter(new[] { "kp2a.action.PluginListActivity" }, Categories = new[] { Intent.CategoryDefault })]
 	public class PluginListActivity : ListActivity
 	{
diff --git a/src/keepass2android/search/SearchResults.cs b/src/keepass2android/search/SearchResults.cs
index 5a5ac26c..3ea200af 100644
--- a/src/keepass2android/search/SearchResults.cs
+++ b/src/keepass2android/search/SearchResults.cs
@@ -30,7 +30,15 @@ namespace keepass2android.search
 	/// Activity to show search results
 	/// </summary>
     [Activity(Label = "@string/app_name", Theme = "@style/MyTheme_ActionBar", LaunchMode = Android.Content.PM.LaunchMode.SingleTop)]
-	[MetaData("android.app.searchable",Resource=AppNames.Searchable)]
+#if NoNet
+    [MetaData("android.app.searchable", Resource = "@xml/searchable_offline")]
+#else
+#if DEBUG
+	[MetaData("android.app.searchable", Resource = "@xml/searchable_debug")]
+#else
+    [MetaData("android.app.searchable", Resource = "@xml/searchable")]
+#endif
+#endif
 	[MetaData("android.app.default_searchable", Value = "keepass2android.search.SearchResults")]
 	[IntentFilter(new[]{Intent.ActionSearch}, Categories=new[]{Intent.CategoryDefault})]
 	public class SearchResults : GroupBaseActivity