diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 2d98b25845f..9f2c598b0db 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -28,15 +28,6 @@
android:inputType="textPassword"
style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
-
+
diff --git a/res/layout/crypt_keeper_pattern_field.xml b/res/layout/crypt_keeper_pattern_field.xml
index cf6a29fb487..e12f77b7a83 100644
--- a/res/layout/crypt_keeper_pattern_field.xml
+++ b/res/layout/crypt_keeper_pattern_field.xml
@@ -26,15 +26,6 @@
android:layout_height="match_parent"
android:background="@color/lock_pattern_background" />
-
+
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index 2fc1e818972..af0ade5771d 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -28,15 +28,6 @@
android:inputType="numberPassword"
style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
-
+
diff --git a/res/layout/crypt_keeper_switch_input_method.xml b/res/layout/crypt_keeper_switch_input_method.xml
new file mode 100644
index 00000000000..b55db22f340
--- /dev/null
+++ b/res/layout/crypt_keeper_switch_input_method.xml
@@ -0,0 +1,31 @@
+
+
+
+