diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index 74893c7cbd6..fd524133df5 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -46,18 +46,15 @@
         <EditText android:id="@+id/password_entry"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:layout_gravity="center"
             android:layout_weight="1"
-            android:singleLine="true"
-            android:textStyle="bold"
             android:inputType="textPassword"
             android:imeOptions="actionNext"
             android:gravity="center"
-            android:layout_gravity="center"
             android:textSize="24sp"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="#ffffffff"
+            style="@style/TextAppearance.PasswordEntry"
         />
     </LinearLayout>
 
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 604f766afa4..ad7fbc0a577 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -47,18 +47,15 @@
         <EditText android:id="@+id/password_entry"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:layout_gravity="center"
             android:layout_weight="1"
-            android:singleLine="true"
-            android:textStyle="bold"
             android:inputType="textPassword"
             android:imeOptions="actionNext"
             android:gravity="center"
-            android:layout_gravity="center"
             android:textSize="24sp"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="#ffffffff"
+            style="@style/TextAppearance.PasswordEntry"
         />
     </LinearLayout>
 
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
index fa54c146dda..199c9ac4cb9 100644
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -47,18 +47,15 @@
         <EditText android:id="@+id/password_entry"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:layout_gravity="center"
             android:layout_weight="1"
-            android:singleLine="true"
-            android:textStyle="bold"
             android:inputType="textPassword"
             android:imeOptions="actionNext"
             android:gravity="center"
-            android:layout_gravity="center"
             android:textSize="24sp"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="#ffffffff"
+            style="@style/TextAppearance.PasswordEntry"
         />
     </LinearLayout>
 
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
index dc448db9140..e3cc20c3375 100644
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -48,18 +48,15 @@
         <EditText android:id="@+id/password_entry"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:layout_gravity="center"
             android:layout_weight="1"
-            android:singleLine="true"
-            android:textStyle="bold"
             android:inputType="textPassword"
             android:imeOptions="actionNext"
             android:gravity="center"
-            android:layout_gravity="center"
             android:textSize="24sp"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="#ffffffff"
+            style="@style/TextAppearance.PasswordEntry"
         />
     </LinearLayout>
 
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
index b4b82944389..ca8975ee5db 100644
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -34,18 +34,15 @@
     <EditText android:id="@+id/password_entry"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textStyle="bold"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:textSize="32sp"
         android:layout_marginTop="15dip"
         android:layout_marginStart="30dip"
         android:layout_marginEnd="30dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="#ffffffff"
+        android:layout_gravity="center"
+        android:inputType="textPassword"
+        android:imeOptions="actionNext"
+        android:gravity="center"
+        android:textSize="32sp"
+        style="@style/TextAppearance.PasswordEntry"
     />
 
     <!-- Spacer between password entry and keyboard -->
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index ff7c847d6ec..9e236d58b67 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -46,18 +46,15 @@
     <EditText android:id="@+id/password_entry"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textStyle="bold"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:textSize="32sp"
         android:layout_marginTop="15dip"
         android:layout_marginStart="30dip"
         android:layout_marginEnd="30dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="#ffffffff"
+        android:layout_gravity="center"
+        android:inputType="textPassword"
+        android:imeOptions="actionNext"
+        android:gravity="center"
+        android:textSize="32sp"
+        style="@style/TextAppearance.PasswordEntry"
     />
 
     <!-- Spacer between password entry and keyboard -->
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 59f7f9fc306..c13d150c804 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -34,17 +34,14 @@
     <EditText android:id="@+id/password_entry"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textStyle="bold"
+        android:layout_gravity="center"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:inputType="textPassword"
         android:imeOptions="actionNext"
         android:gravity="center"
-        android:layout_gravity="center"
         android:textSize="24sp"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="#ffffffff"
+        style="@style/TextAppearance.PasswordEntry"
     />
 
     <!-- Spacer between password entry and keyboard -->
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index ad736817ba9..0ea4c5226f3 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -37,17 +37,14 @@
     <EditText android:id="@+id/password_entry"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textStyle="bold"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
+        android:layout_gravity="center"
         android:inputType="textPassword"
         android:imeOptions="actionNext"
         android:gravity="center"
-        android:layout_gravity="center"
         android:textSize="24sp"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="#ffffffff"
+        style="@style/TextAppearance.PasswordEntry"
     />
 
     <!-- Spacer between password entry and keyboard -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3416b2c6564..ada98683403 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -75,6 +75,13 @@
         <item name="android:textStyle">normal</item>
     </style>
 
+    <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance">
+        <item name="android:gravity">center</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
     <style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar">
         <item name="android:windowContentOverlay">@null</item>
     </style>