diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 382e0406e..000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-KeePassDroid
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3dcb82652..e05fe4857 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -39,7 +39,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 41fb787ea..b6ef7a7e2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/KeePassDroid.iml" filepath="$PROJECT_DIR$/KeePassDroid.iml" group="KeePassDroid" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="KeePassDroid/app" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="keepassdroid/app" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/keepassdroid.iml" filepath="$PROJECT_DIR$/.idea/modules/keepassdroid.iml" group="keepassdroid" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/KeePassDroid.iml b/KeePassDroid.iml
deleted file mode 100644
index 558e90bf8..000000000
--- a/KeePassDroid.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="KeePassDroid" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 0a26087e6..ab9ffa26e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="keepassdroid" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.6.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.6.3" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.0.1" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="4.0.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -19,8 +19,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/general/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/src/generalDebug/res;file://$MODULE_DIR$/build/generated/res/rs/general/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestGeneral/res;file://$MODULE_DIR$/src/testGeneral/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/general/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
diff --git a/app/src/main/res/drawable/rounded_buttons.xml b/app/src/main/res/drawable/rounded_buttons.xml
new file mode 100644
index 000000000..e489b2b15
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_buttons.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="3dip" />
+            <stroke android:width="1dip" android:color="#EE7974" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_buttons_green.xml b/app/src/main/res/drawable/rounded_buttons_green.xml
new file mode 100644
index 000000000..ad4cdd0c6
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_buttons_green.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="3dip" />
+            <stroke android:width="1dip" android:color="#5e7974" />
+            <gradient android:angle="-90" android:startColor="#345953" android:endColor="#689a92"  />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="3dip" />
+            <stroke android:width="1dip" android:color="#5e7974" />
+            <solid android:color="#58857e"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="3dip" />
+            <stroke android:width="1dip" android:color="#5e7974" />
+            <gradient android:angle="-90" android:startColor="#8dbab3" android:endColor="#58857e" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 176bddcc1..b0ad8e631 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -20,15 +20,22 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
+  android:layout_height="fill_parent"
+	android:padding="@dimen/margin_medium">
 	<TextView android:id="@+id/about_title" 
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:text="@string/AboutText"/>
 	<ImageView android:id="@+id/divider1"
 	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"
+	  android:layout_height="2dp"
 	  android:layout_below="@id/about_title"
+		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
+		android:layout_marginTop="@dimen/margin_small"
+		android:layout_marginBottom="@dimen/margin_small"
 	  android:scaleType="fitXY"
 	  tools:ignore="ContentDescription"
 	  android:src="@android:drawable/divider_horizontal_dark"/>
@@ -41,11 +48,18 @@
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_below="@id/divider1"
-	  android:layout_alignParentRight="true"/>
+	  android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true" />
 	<ImageView android:id="@+id/divider2"
 	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"
+	  android:layout_height="2dp"
 	  android:layout_below="@id/version_title"
+		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
+		android:layout_marginTop="@dimen/margin_small"
+		android:layout_marginBottom="@dimen/margin_small"
 	  android:scaleType="fitXY"
 	  tools:ignore="ContentDescription"
 	  android:src="@android:drawable/divider_horizontal_dark"/>
@@ -59,7 +73,8 @@
 	  android:text="@string/homepage_short"
 	  android:layout_below="@id/divider2"
 	  android:layout_alignParentRight="true"
-	  android:autoLink="web"/>
+	  android:autoLink="web"
+		android:layout_alignParentEnd="true" />
 	<TextView android:id="@+id/feedback" 
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
@@ -70,7 +85,8 @@
 	  android:text="@string/issues"
 	  android:layout_below="@id/homepage"
 	  android:layout_alignParentRight="true"
-	  android:autoLink="web"/>
+	  android:autoLink="web"
+		android:layout_alignParentEnd="true" />
 	<TextView android:id="@+id/Twitter" 
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
@@ -81,12 +97,19 @@
 	  android:text="@string/twitter"
 	  android:layout_below="@id/feedback"
 	  android:layout_alignParentRight="true"
-	  android:autoLink="web"/>
+	  android:autoLink="web"
+		android:layout_alignParentEnd="true" />
 	<ImageView android:id="@+id/divider3"
 	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"
+	  android:layout_height="2dp"
 	  android:layout_below="@id/Twitter"
 	  android:scaleType="fitXY"
+		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
+		android:layout_marginTop="@dimen/margin_small"
+		android:layout_marginBottom="@dimen/margin_small"
 	  tools:ignore="ContentDescription"
 	  android:src="@android:drawable/divider_horizontal_dark"/>
 	<TextView android:id="@+id/disclaimer" 
@@ -98,6 +121,7 @@
   	  android:layout_height="wrap_content"
   	  android:layout_width="wrap_content"
   	  android:layout_below="@id/disclaimer"
+		android:layout_marginTop="@dimen/margin_medium"
   	  android:layout_centerHorizontal="true"
   	  android:text="@android:string/ok"
   	  android:width="100sp"/>
diff --git a/app/src/main/res/layout/entry_edit.xml b/app/src/main/res/layout/entry_edit.xml
index 02710583d..fc59520a3 100644
--- a/app/src/main/res/layout/entry_edit.xml
+++ b/app/src/main/res/layout/entry_edit.xml
@@ -20,7 +20,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
+	android:padding="@dimen/margin_medium"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
+
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
@@ -29,21 +31,25 @@
 		android:elevation="4dp"
 		android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
 		app:popupTheme="@style/ThemeOverlay.AppCompat" />
+
 	<Button android:id="@+id/entry_save"
       android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentBottom="true"
 	  android:text="@string/entry_save"/>
+
 	<Button android:id="@+id/entry_cancel"
       android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentBottom="true"
 	  android:layout_toRightOf="@id/entry_save"
 	  android:text="@string/entry_cancel"/>
+
 	<View android:id="@+id/entry_divider"
 	  android:layout_above="@id/entry_save"
 	  android:scaleType="fitXY"
 	  style="@style/DividerEntry"/>
+
 	<com.keepassdroid.view.NoFocusScrollView android:id="@+id/entry_scroll"
 	  android:layout_width="fill_parent"
 	  android:layout_height="fill_parent"
@@ -189,4 +195,5 @@
 			/>    
 		</RelativeLayout>
 	</com.keepassdroid.view.NoFocusScrollView>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/generate_password.xml b/app/src/main/res/layout/generate_password.xml
index 2136dbaed..a90abd7f2 100644
--- a/app/src/main/res/layout/generate_password.xml
+++ b/app/src/main/res/layout/generate_password.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  Copyright 2010-2013 Tolga Onbay, Brian Pellin.
      
  This file is part of KeePassDroid.
@@ -18,123 +17,220 @@
   along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-	<Button android:id="@+id/accept_button"
-	  android:layout_height="wrap_content"
-	  android:layout_width="wrap_content"
-	  android:text="@string/accept" 
-	  android:layout_alignParentBottom="true" />
-	<Button android:id="@+id/cancel_button"
-	  android:layout_height="wrap_content" 
-	  android:layout_width="wrap_content" 
-	  android:text="@string/cancel" 
-	  android:layout_alignParentBottom="true" 
-	  android:layout_toRightOf="@id/accept_button" />
-	<ScrollView android:id="@+id/ScrollView"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_above="@id/cancel_button">
-		<RelativeLayout android:id="@+id/RelativeLayout"
-			android:layout_height="wrap_content"
-			android:layout_width="wrap_content">
-		    <EditText android:id="@+id/password"
-	          android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:ems="10"
-		      android:singleLine="true"
-		      android:typeface="monospace"
-		      android:hint="@string/hint_generated_password" />
-		    <Button android:id="@+id/generate_password_button"
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:layout_below="@id/password"
-		      android:text="@string/generate_password" />
-		    <TextView android:id="@+id/length_label"
-		      android:text="@string/length"
-		      android:layout_height="fill_parent"
-		      android:layout_width="fill_parent"
-		      android:layout_below="@id/generate_password_button" />
-			<Button android:id="@+id/btn_length16"
-			  android:text="@string/generate_16"
-			  android:layout_alignParentRight="true"
-			  android:layout_height="wrap_content"
-			  android:layout_width="wrap_content"
-			  android:minWidth="60dp"
-			  android:layout_below="@id/length_label" />
-			<Button android:id="@+id/btn_length12"
-			  android:text="@string/generate_12"
-			  android:layout_toLeftOf="@id/btn_length16"
-			  android:layout_height="wrap_content"
-			  android:layout_width="wrap_content"
-			  android:minWidth="60dp"
-			  android:layout_alignTop="@id/btn_length16" />
-			<Button android:id="@+id/btn_length8"
-			  android:text="@string/generate_8"
-			  android:layout_toLeftOf="@id/btn_length12" 
-			  android:layout_height="wrap_content" 
-			  android:layout_width="wrap_content"
-			  android:minWidth="60dp"
-			  android:layout_alignTop="@id/btn_length16" />
-			<Button android:id="@+id/btn_length6" 
-			  android:text="@string/generate_6" 
-			  android:layout_toLeftOf="@id/btn_length8" 
-			  android:layout_height="wrap_content" 
-			  android:layout_width="wrap_content"
-			  android:minWidth="60dp"
-			  android:layout_alignTop="@id/btn_length16" />
-			<EditText android:id="@+id/length" 
-			  android:layout_width="fill_parent" 
-			  android:layout_toLeftOf="@id/btn_length6" 
-			  android:layout_height="wrap_content" 
-			  android:layout_alignTop="@id/btn_length16"
-			  android:singleLine="true"
-			  android:inputType="number"
-			  android:text="@string/generate_8"
-			  android:hint="@string/hint_length"/>
-			<CheckBox android:id="@+id/cb_uppercase" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content" 
-			  android:text="@string/uppercase" 
-			  android:checked="true"
-			  android:layout_below="@id/length" />
-			<CheckBox android:id="@+id/cb_lowercase" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content"
-			  android:text="@string/lowercase" 
-			  android:checked="true"
-			  android:layout_below="@id/cb_uppercase" />
-			<CheckBox android:id="@+id/cb_digits" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content" 
-			  android:text="@string/digits" 
-			  android:checked="true"
-			  android:layout_below="@id/cb_lowercase" />
-			<CheckBox android:id="@+id/cb_minus" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content"
-			  android:text="@string/minus" 
-			  android:layout_below="@id/cb_digits" />
-			<CheckBox android:id="@+id/cb_underline" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content" 
-			  android:text="@string/underline" 
-			  android:layout_below="@id/cb_minus" />
-			<CheckBox android:id="@+id/cb_space" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content" 
-			  android:text="@string/space" 
-			  android:layout_below="@id/cb_underline" />
-			<CheckBox android:id="@+id/cb_specials" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content" 
-			  android:text="@string/special" 
-			  android:layout_below="@id/cb_space" />
-			<CheckBox android:id="@+id/cb_brackets" 
-			  android:layout_width="wrap_content" 
-			  android:layout_height="wrap_content" 
-			  android:text="@string/brackets" 
-			  android:layout_below="@id/cb_specials" />
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+	android:padding="@dimen/margin_medium">
+
+	<ScrollView
+		android:id="@+id/ScrollView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_centerInParent="true">
+
+		<RelativeLayout
+			android:id="@+id/RelativeLayout"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content">
+
+
+			<TextView
+				android:id="@+id/generate_password_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_alignParentTop="true"
+				android:textSize="21sp"
+				android:text="@string/allowed_password_chars"/>
+
+			<!-- layout_below -->
+			<GridLayout
+				android:id="@+id/agridlayout"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/generate_password_title"
+				android:layout_marginTop="@dimen/margin_small"
+				android:columnCount="2"
+				android:rowCount="4">
+
+				<CheckBox
+					android:id="@+id/cb_uppercase"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:checked="true"
+					android:text="@string/uppercase" />
+
+				<CheckBox
+					android:id="@+id/cb_lowercase"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:checked="true"
+					android:text="@string/lowercase" />
+
+				<CheckBox
+					android:id="@+id/cb_digits"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:checked="true"
+					android:text="@string/digits" />
+
+				<CheckBox
+					android:id="@+id/cb_specials"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/special" />
+
+				<CheckBox
+					android:id="@+id/cb_minus"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/minus" />
+
+				<CheckBox
+					android:id="@+id/cb_underline"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/underline" />
+
+				<CheckBox
+					android:id="@+id/cb_brackets"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/brackets" />
+
+				<CheckBox
+					android:id="@+id/cb_space"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/space" />
+
+			</GridLayout>
+
+
+
+
+			<View
+				android:id="@+id/divider1"
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_below="@id/agridlayout"
+				android:layout_marginTop="@dimen/margin_medium"
+				android:background="@android:color/darker_gray"/>
+
+
+			<TextView
+				android:id="@+id/length_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignBottom="@id/length"
+				android:layout_marginBottom="6dp"
+				android:textSize="21sp"
+				android:layout_marginTop="@dimen/margin_medium"
+				android:layout_marginEnd="@dimen/margin_medium"
+				android:layout_marginRight="@dimen/margin_medium"
+				android:text="@string/length" />
+
+			<EditText
+				android:id="@+id/length"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_toEndOf="@id/length_label"
+				android:layout_toRightOf="@id/length_label"
+				android:layout_below="@id/divider1"
+				android:layout_marginTop="@dimen/margin_medium"
+				android:hint="@string/hint_length"
+				android:inputType="number"
+				android:singleLine="true"
+				android:text="@string/generate_8" />
+
+			<Button
+				android:id="@+id/btn_length6"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/length_label"
+				android:layout_alignParentStart="true"
+				android:layout_alignParentLeft="true"
+				android:layout_marginTop="@dimen/margin_medium"
+				android:minWidth="95dp"
+				android:text="@string/generate_6" />
+
+			<Button
+				android:id="@+id/btn_length8"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignTop="@id/btn_length6"
+				android:layout_toEndOf="@id/btn_length6"
+				android:layout_toRightOf="@id/btn_length6"
+				android:minWidth="95dp"
+				android:text="@string/generate_8" />
+
+			<Button
+				android:id="@+id/btn_length12"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignTop="@id/btn_length6"
+				android:layout_toEndOf="@id/btn_length8"
+				android:layout_toRightOf="@id/btn_length8"
+				android:minWidth="95dp"
+				android:text="@string/generate_12" />
+
+			<Button
+				android:id="@+id/btn_length16"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignTop="@id/btn_length6"
+				android:layout_toEndOf="@id/btn_length12"
+				android:layout_toRightOf="@id/btn_length12"
+				android:minWidth="95dp"
+				android:text="@string/generate_16" />
+
+			<EditText
+				android:id="@+id/password"
+				android:layout_width="fill_parent"
+				android:layout_height="90sp"
+				android:layout_marginTop="@dimen/margin_medium"
+				android:fontFamily="IBM Plex Serif"
+				android:textSize="30sp"
+				android:layout_below="@id/btn_length16"
+				android:autofillHints="@string/hint_generated_password"
+				android:ems="10"
+				android:textAlignment="center"
+				android:gravity="center_horizontal"
+				android:hint="@string/hint_generated_password"
+				android:singleLine="true" />
+
+			<Button
+				android:id="@+id/generate_password_button"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/password"
+				android:text="@string/generate_password"
+				android:background="@drawable/rounded_buttons_green" />
+
 		</RelativeLayout>
 	</ScrollView>
+
+    <Button
+        android:id="@+id/accept_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+		android:layout_below="@id/ScrollView"
+		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_alignParentLeft="true"
+        android:text="@string/accept"
+		android:width="195dp"
+		android:background="@drawable/rounded_buttons_green"
+		android:layout_alignParentStart="true" />
+
+    <Button
+        android:id="@+id/cancel_button"
+		android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+		android:layout_alignTop="@id/accept_button"
+		android:layout_toRightOf="@id/accept_button"
+		android:layout_toEndOf="@id/accept_button"
+		android:layout_alignParentRight="true"
+		android:width="195dp"
+        android:text="@string/cancel"
+		android:background="@drawable/rounded_buttons"
+		android:layout_alignParentEnd="true" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/password.xml b/app/src/main/res/layout/password.xml
index abee43e4f..f9ee74a70 100644
--- a/app/src/main/res/layout/password.xml
+++ b/app/src/main/res/layout/password.xml
@@ -20,6 +20,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+	android:padding="@dimen/margin_medium"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/password_activity.xml b/app/src/main/res/layout/password_activity.xml
index ee83f7e44..44e049c7e 100644
--- a/app/src/main/res/layout/password_activity.xml
+++ b/app/src/main/res/layout/password_activity.xml
@@ -24,6 +24,7 @@
     <fragment android:name="com.keepassdroid.fragments.PasswordFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:padding="@dimen/margin_medium"
         android:id="@+id/password_fragment" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/set_password.xml b/app/src/main/res/layout/set_password.xml
index 0355a979c..2835fd4f1 100644
--- a/app/src/main/res/layout/set_password.xml
+++ b/app/src/main/res/layout/set_password.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  Copyright 2009-2015 Brian Pellin.
      
  This file is part of KeePassDroid.
@@ -18,37 +17,55 @@
   along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-
-	<EditText android:id="@+id/pass_password" 
-	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"
-	  android:inputType="textPassword"
-	  android:singleLine="true"
-	  android:hint="@string/hint_pass"/>
-	<EditText android:id="@+id/pass_conf_password" 
-	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"
-	  android:layout_below="@id/pass_password"
-	  android:inputType="textPassword"
-	  android:singleLine="true"
-	  android:hint="@string/hint_conf_pass"/>
-	<EditText android:id="@+id/pass_keyfile" 
-	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"
-	  android:layout_below="@id/pass_conf_password" 
-	  android:singleLine="true"
-	  android:hint="@string/hint_keyfile"/>
-	<Button android:id="@+id/ok" 
-	  android:layout_width="100sp"
-	  android:layout_height="wrap_content"
-	  android:layout_below="@id/pass_keyfile"
-	  android:text="@android:string/ok"/>
-	<Button android:id="@+id/cancel" 
-	  android:layout_width="100sp"
-	  android:layout_height="wrap_content"
-	  android:layout_below="@id/pass_keyfile"
-	  android:layout_toRightOf="@id/ok"
-	  android:text="@string/cancel"/>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="@dimen/margin_medium">
+
+    <EditText
+        android:id="@+id/pass_password"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_small"
+        android:hint="@string/hint_pass"
+        android:inputType="textPassword"
+        android:singleLine="true" />
+
+    <EditText
+        android:id="@+id/pass_conf_password"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/pass_password"
+        android:layout_marginBottom="@dimen/margin_small"
+        android:hint="@string/hint_conf_pass"
+        android:inputType="textPassword"
+        android:singleLine="true" />
+
+    <EditText
+        android:id="@+id/pass_keyfile"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/pass_conf_password"
+        android:layout_marginBottom="@dimen/margin_small"
+        android:hint="@string/hint_keyfile"
+        android:singleLine="true" />
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="100sp"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/pass_keyfile"
+        android:layout_marginTop="@dimen/margin_small"
+        android:text="@android:string/ok" />
+
+    <Button
+        android:id="@+id/cancel"
+        android:layout_width="100sp"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/pass_keyfile"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginStart="@dimen/margin_small"
+		android:layout_alignTop="@id/ok"
+        android:layout_toEndOf="@id/ok"
+        android:layout_toRightOf="@id/ok"
+        android:text="@string/cancel" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index 5fc6c55d9..d44a18ada 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -20,5 +20,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/settings"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent"
+    android:padding="@dimen/margin_medium"/>
 
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 52bd0a234..a376520aa 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -30,8 +30,8 @@
     <string name="twitter">twitter.com/bpellin</string>
     
     <!--  Password generator -->
-    <string name="generate_6">6</string>
-    <string name="generate_8">8</string>
+    <string name="generate_6">06</string>
+    <string name="generate_8">08</string>
     <string name="generate_12">12</string>
     <string name="generate_16">16</string>
     
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15f5951f6..6ea01e7ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="add_group_title">Add Group</string>
     <string name="add_string">Add string</string>
     <string name="algorithm">Algorithm</string>
+    <string name="allowed_password_chars">Allowed characters</string>
     <string name="app_name">KeePassDroid</string>
     <string name="app_timeout">Application timeout</string>
     <string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
@@ -63,8 +64,8 @@
     <string name="database">Database</string>
     <string name="decrypting_db">Decrypting database contents&#8230;</string>
     <string name="default_checkbox">Use this as my default database</string>
-    <string name="digits">Digits</string>
-    <string name="disclaimer_formal">KeePassDroid Copyright 2009&#8211;2020 Brian Pellin comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
+    <string name="digits">Digits (123...)</string>
+    <string name="disclaimer_formal">KeePassDroid © 2009&#8211;2020 Brian Pellin comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
     <string name="ellipsis">\u2026</string>
     <string name="enter_filename">Enter database filename:</string>
     <string name="entry_accessed">Accessed: </string>
@@ -108,16 +109,16 @@
     <string name="file_browser">File Browser</string>
     <string name="generate_password">Generate Password</string>
     <string name="group">Group</string>
-    <string name="hint_comment">comment</string>
-    <string name="hint_conf_pass">confirm password</string>
-    <string name="hint_generated_password">generated password</string>
+    <string name="hint_comment">Comment</string>
+    <string name="hint_conf_pass">Confirm password</string>
+    <string name="hint_generated_password">Generated password</string>
     <string name="hint_group_name">Group name</string>
     <string name="hint_keyfile">key file</string>
     <string name="hint_length">length</string>
-    <string name="hint_pass">password</string>
+    <string name="hint_pass">Password</string>
     <string name="hint_login_pass">Password</string>
-    <string name="hint_title">name</string>
-    <string name="hint_url">url</string>
+    <string name="hint_title">Name</string>
+    <string name="hint_url">URL</string>
     <string name="hint_username">username</string>
     <string name="install_from_market">Install from Play Store</string>
     <string name="install_from_website">Install from Web</string>
@@ -126,11 +127,11 @@
     <string name="invalid_db_sig">Database format not recognized.</string>
     <string name="keyfile_does_not_exist">Key file does not exist.</string>
     <string name="keyfile_is_empty">Key file is empty.</string>
-    <string name="length">Length</string>
+    <string name="length">Length:</string>
     <string name="list_size_title">Group list size</string>
     <string name="list_size_summary">Text size in the group list</string>
     <string name="loading_database">Loading database&#8230;</string>
-    <string name="lowercase">Lower-case</string>
+    <string name="lowercase">Lower-case (xyz...)</string>
     <string name="maskpass_title">Mask password</string>
     <string name="maskpass_summary">Hide passwords by default</string>
     <string name="menu_about">About</string>
@@ -191,7 +192,7 @@
     <string name="twofish">Twofish</string>
     <string name="underline">Underline</string>
     <string name="unsupported_db_version">Unsupported database version.</string>
-    <string name="uppercase">Upper-case</string>
+    <string name="uppercase">Upper-case (XYZ...)</string>
     <string name="use_saf_summary">Use Android Storage Access Framework for file browsing (KitKat and later)</string>
     <string name="use_saf_title">Storage access framework</string>
     <string name="warning">Warning</string>
diff --git a/build.gradle b/build.gradle
index 7bb9a95ff..8f0dbd2ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 154f9571d..ae9cecb95 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 09 21:09:55 CST 2020
+#Sun Jul 26 20:59:58 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip