diff --git a/OpenKeychain/src/main/res/layout/transfer_code_display.xml b/OpenKeychain/src/main/res/layout/transfer_code_display.xml
index 67d687ea1..652c82491 100644
--- a/OpenKeychain/src/main/res/layout/transfer_code_display.xml
+++ b/OpenKeychain/src/main/res/layout/transfer_code_display.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -16,12 +17,18 @@
             The most reliable way to correctly size these I found was to put a transparent hint on them.
              Theoretically, this should be what the android:ems attribute is for - didn't work for me.
             -->
-        <TextView
+        <org.sufficientlysecure.keychain.ui.widget.PrefixedEditText
             android:id="@+id/transfer_code_block_1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:enabled="false"
+            custom:prefixColor="@color/md_grey_600"
+            tools:hint="34"
+            tools:prefix="12"
+            tools:text="34"
             style="@style/TransferCodeText"
-            tools:text="1234" />
+            />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/transfer_code_input.xml b/OpenKeychain/src/main/res/layout/transfer_code_input.xml
index d0f1996c9..8b74a388f 100644
--- a/OpenKeychain/src/main/res/layout/transfer_code_input.xml
+++ b/OpenKeychain/src/main/res/layout/transfer_code_input.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_gravity="center_horizontal"
     android:orientation="vertical"
     tools:showIn="@layout/backup_code_fragment">
@@ -17,6 +18,7 @@
             android:id="@+id/transfer_code_block_1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            custom:prefixColor="@color/md_grey_600"
             tools:prefix="12"
             tools:hint="34"
             style="@style/TransferCodeText"
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 71098667d..b70093b7a 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -69,6 +69,7 @@
         <item name="android:gravity">center_vertical</item>
         <item name="android:singleLine">true</item>
         <item name="android:hint">1234</item>
+        <item name="android:maxLength">4</item>
         <item name="android:textColorHint">@android:color/transparent</item>
         <item name="android:textSize">18sp</item>
         <item name="android:minHeight">42sp</item>