diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
deleted file mode 100644
index f0a7cd0009a..00000000000
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
->
-
-    <include layout="@layout/crypt_keeper_status" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        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_centerVertical="true"
-            android:src="@drawable/encroid_resignin"
-            android:contentDescription="@null"
-        />
-
-        <TextView android:id="@+id/passwordLabel"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_toEndOf="@+id/encroid"
-            android:layout_centerVertical="true"
-            android:paddingEnd="17dip"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/crypt_keeper_enter_password"
-        />
-
-        <!-- Password entry field -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="320dip"
-            android:layout_toEndOf="@+id/passwordLabel"
-            android:layout_centerVertical="true"
-            android:orientation="horizontal"
-        >
-            <include layout="@layout/crypt_keeper_password_field" />
-        </LinearLayout>
-
-    </RelativeLayout>
-</LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
index e82e14f6ca8..4685ebf4006 100644
--- a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
@@ -20,8 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
->
+    android:layout_height="match_parent">
 
     <include layout="@layout/crypt_keeper_status" />
 
@@ -29,24 +28,14 @@
         android:layout_width="wrap_content"
         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_centerVertical="true"
-            android:src="@drawable/encroid_resignin"
-            android:contentDescription="@null"
-        />
+        android:layout_gravity="center_horizontal">
 
         <!-- Password entry field -->
         <LinearLayout
-            android:layout_height="354dip"
-            android:layout_width="354dip"
-            android:layout_toEndOf="@+id/encroid"
+            android:layout_height="@dimen/crypt_keeper_pattern_size"
+            android:layout_width="@dimen/crypt_keeper_pattern_size"
             android:layout_centerVertical="true"
-            android:orientation="horizontal"
-        >
+            android:orientation="horizontal">
             <include layout="@layout/crypt_keeper_pattern_field" />
         </LinearLayout>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 29d311f0add..2064e1951fc 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -180,4 +180,7 @@
     <!-- CryptKeeper edit text ime icon padding -->
     <dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen>
 
+    <!-- CryptKeeper pattern size for tablet -->
+    <dimen name="crypt_keeper_pattern_size">354dip</dimen>
+
 </resources>