diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 9f2c598b0db..34c7f64fc40 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -26,6 +26,8 @@
         android:layout_width="0dip"
         android:layout_weight="1"
         android:inputType="textPassword"
+        android:textSize="16sp"
+        android:padding="10sp"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
    <include layout="@layout/crypt_keeper_switch_input_method" />
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index af0ade5771d..56b4978e4da 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -26,6 +26,8 @@
         android:layout_width="0dip"
         android:layout_weight="1"
         android:inputType="numberPassword"
+        android:textSize="28sp"
+        android:padding="4sp"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
    <include layout="@layout/crypt_keeper_switch_input_method" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index eacf7bc70dc..55dcd663889 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -83,7 +83,6 @@
     </style>
 
     <style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
-        <item name="android:textSize">36sp</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:background">@null</item>
         <item name="android:textCursorDrawable">@null</item>