diff --git a/res/drawable-hdpi/password_field_default.9.png b/res/drawable-hdpi/password_field_default.9.png
deleted file mode 100644
index 2c424f061d0..00000000000
Binary files a/res/drawable-hdpi/password_field_default.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/password_field_default.9.png b/res/drawable-mdpi/password_field_default.9.png
deleted file mode 100644
index 3193275cda6..00000000000
Binary files a/res/drawable-mdpi/password_field_default.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/password_field_default.9.png b/res/drawable-xhdpi/password_field_default.9.png
deleted file mode 100644
index cf8329e3862..00000000000
Binary files a/res/drawable-xhdpi/password_field_default.9.png and /dev/null differ
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index 08dcf647c31..74893c7cbd6 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -57,7 +57,6 @@
             android:layout_marginTop="5dip"
             android:layout_marginBottom="5dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
         />
     </LinearLayout>
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 4130a48ac51..604f766afa4 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -58,7 +58,6 @@
             android:layout_marginTop="5dip"
             android:layout_marginBottom="5dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
         />
     </LinearLayout>
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
index 05d4a249658..fa54c146dda 100644
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -58,7 +58,6 @@
             android:layout_marginTop="5dip"
             android:layout_marginBottom="5dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
         />
     </LinearLayout>
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
index 5844a60ab9c..dc448db9140 100644
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -59,7 +59,6 @@
             android:layout_marginTop="5dip"
             android:layout_marginBottom="5dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
         />
     </LinearLayout>
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
index 43be0329b41..b4b82944389 100644
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -30,15 +30,6 @@
         android:lines="2"
         android:textAppearance="?android:attr/textAppearanceLarge"/>
 
-    <!-- spacer above text entry field -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="6dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
     <!-- Password entry field -->
     <EditText android:id="@+id/password_entry"
         android:layout_width="match_parent"
@@ -54,7 +45,6 @@
         android:layout_marginStart="30dip"
         android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
     />
 
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index cb6fafd94a4..ff7c847d6ec 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -57,7 +57,6 @@
         android:layout_marginStart="30dip"
         android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
     />
 
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 0c7c11b0a46..59f7f9fc306 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -30,14 +30,6 @@
         android:lines="2"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <!-- spacer above text entry field -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
     <!-- Password entry field -->
     <EditText android:id="@+id/password_entry"
         android:layout_width="match_parent"
@@ -52,7 +44,6 @@
         android:layout_marginStart="30dip"
         android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
     />
 
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index b6c60c3ae9c..ad736817ba9 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -33,15 +33,6 @@
         android:lines="2"
         android:textAppearance="?android:attr/textAppearanceLarge"/>
 
-    <!-- spacer above text entry field -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="6dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
     <!-- Password entry field -->
     <EditText android:id="@+id/password_entry"
         android:layout_width="match_parent"
@@ -56,7 +47,6 @@
         android:layout_marginStart="30dip"
         android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
     />