diff --git a/app/src/main/res/drawable-v21/button_background.xml b/app/src/main/res/drawable-v21/button_background.xml
index d439a8008..0905ef11a 100644
--- a/app/src/main/res/drawable-v21/button_background.xml
+++ b/app/src/main/res/drawable-v21/button_background.xml
@@ -6,12 +6,12 @@
     <item>
         <shape>
             <corners
-                android:radius="2dp" />
+                android:radius="0dp" />
             <padding
                 android:left="0dp"
                 android:right="0dp"
-                android:top="8dp"
-                android:bottom="8dp"/>
+                android:top="12dp"
+                android:bottom="12dp"/>
             <solid android:color="?attr/colorAccentCompat"/>
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
index 3c7235aaf..737973744 100644
--- a/app/src/main/res/drawable/button_background.xml
+++ b/app/src/main/res/drawable/button_background.xml
@@ -3,12 +3,12 @@
     <item>
         <shape>
             <corners
-                android:radius="2dp" />
+                android:radius="0dp" />
             <padding
                 android:left="0dp"
                 android:right="0dp"
-                android:top="8dp"
-                android:bottom="8dp"/>
+                android:top="12dp"
+                android:bottom="12dp"/>
             <solid android:color="@color/orange"/>
         </shape>
     </item>
diff --git a/app/src/main/res/layout/password.xml b/app/src/main/res/layout/password.xml
index 7869148fd..321a0f762 100644
--- a/app/src/main/res/layout/password.xml
+++ b/app/src/main/res/layout/password.xml
@@ -130,6 +130,7 @@
 
                 <!-- File Input -->
                 <RelativeLayout
+                    android:id="@+id/container_key_file"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
 
@@ -173,9 +174,9 @@
 
                 <android.support.v7.widget.SwitchCompat
                     android:id="@+id/default_database"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/KeepassDXStyle.TextAppearance.Default"
+                    style="@style/KeepassDXStyle.TextAppearance.Small"
                     android:layout_margin="16dp"
                     android:text="@string/default_checkbox" />
 
@@ -187,15 +188,13 @@
 
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/pass_ok"
-        android:layout_marginRight="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginBottom="@dimen/default_margin"
-        android:layout_width="100sp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:text="@string/menu_open" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d66764559..d5a6bc999 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -185,6 +185,9 @@
     <style name="KeepassDXStyle.TextAppearance.Default" parent="KeepassDXStyle.TextAppearance">
         <item name="android:textSize">16sp</item>
     </style>
+    <style name="KeepassDXStyle.TextAppearance.Small" parent="KeepassDXStyle.TextAppearance">
+        <item name="android:textSize">14sp</item>
+    </style>
     <style name="KeepassDXStyle.TextAppearance.Large" parent="KeepassDXStyle.TextAppearance">
         <item name="android:textSize">18sp</item>
     </style>