diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
index 45a630a2f63..9415fd1e44b 100644
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -16,20 +16,21 @@
 ** limitations under the License.
 */
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 >
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="206dip"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
     >
         <ImageView android:id="@+id/encroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_centerVertical="true"
             android:src="@drawable/encroid_resignin"
         />
 
@@ -37,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_toRightOf="@+id/encroid"
-            android:layout_marginTop="37dip"
+            android:layout_centerVertical="true"
             android:paddingRight="17dip"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -51,7 +52,7 @@
             android:layout_height="wrap_content"
             android:layout_width="320dip"
             android:layout_toRightOf="@+id/passwordLabel"
-            android:layout_marginTop="26dip"
+            android:layout_centerVertical="true"
             android:singleLine="true"
             android:inputType="textPassword"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -75,10 +76,9 @@
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:background="#00000000"
         android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
         android:visibility="visible"
     />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index 7bad7ba1951..b55781a1c92 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -14,89 +14,91 @@
      limitations under the License.
   -->
 
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="154dip"
-    android:paddingLeft="128dip"
-    android:paddingRight="128dip"
-    android:paddingBottom="16dip"
 >
-
-    <ImageView
-        android:id="@+id/encroid"
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:paddingRight="65dip"
-        android:src="@drawable/encroid_waiting"
-    />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="48dip"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="16dip"
-        android:textSize="30dip"
-        android:textColor="#ff99cc00"
-        android:text="@string/crypt_keeper_setup_title"
-        android:gravity="bottom"
-    />
-
-    <!-- Divider -->
-    <RelativeLayout
-        android:id="@+id/top_divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/title"
+        android:layout_gravity="center"
     >
-        <ProgressBar
-            android:id="@+id/progress_bar"
+        <ImageView
+            android:id="@+id/encroid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:paddingRight="65dip"
+            android:src="@drawable/encroid_waiting"
+        />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="48dip"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="16dip"
+            android:textSize="30dip"
+            android:textColor="#ff99cc00"
+            android:text="@string/crypt_keeper_setup_title"
+            android:gravity="bottom"
+        />
+
+        <!-- Divider -->
+        <RelativeLayout
+            android:id="@+id/top_divider"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="?android:attr/progressBarStyleHorizontal"
-        />
-    </RelativeLayout>
+            android:layout_below="@+id/title"
+        >
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="?android:attr/progressBarStyleHorizontal"
+            />
+        </RelativeLayout>
 
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/top_divider"
-        android:paddingLeft="152dip"
-        android:paddingTop="21dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-    />
-
-    <!-- Divider -->
-    <RelativeLayout
-        android:id="@+id/bottom_divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="152dip"
-        android:layout_above="@+id/factory_reset"
-        android:visibility="gone"
-    >
-        <ProgressBar
+        <TextView
+            android:id="@+id/status"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_below="@+id/top_divider"
+            android:paddingLeft="152dip"
+            android:paddingTop="21dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
         />
-    </RelativeLayout>
 
-    <Button
-        android:id="@+id/factory_reset"
-        android:layout_width="208dip"
-        android:layout_height="48dip"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="80dip"
-        android:text="@string/master_clear_button_text"
-        android:visibility="gone"
-    />
-</RelativeLayout>
\ No newline at end of file
+        <!-- Divider -->
+        <RelativeLayout
+            android:id="@+id/bottom_divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="152dip"
+            android:layout_above="@+id/factory_reset"
+            android:visibility="gone"
+        >
+            <ProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="?android:attr/progressBarStyleHorizontal"
+            />
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/factory_reset"
+            android:layout_width="208dip"
+            android:layout_height="48dip"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="80dip"
+            android:text="@string/master_clear_button_text"
+            android:visibility="gone"
+        />
+
+    </RelativeLayout>
+</FrameLayout>