diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt
index b6be13be81def6ec21f396f0b89f278cdeb9fd6a..644cf1ee0f3aca6bb52e87b0fcca899b24065220 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt
@@ -1,6 +1,6 @@
 package de.rki.coronawarnapp.ui.submission
 
 object TanConstants {
-    const val MAX_LENGTH = 7
+    const val MAX_LENGTH = 10
     val ALPHA_NUMERIC_CHARS = ('a'..'z').plus('A'..'Z').plus('0'..'9')
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
index 70cc48b6833364f5303cc7d9d7549f2962e58e7f..a7bf4972c56ff3cf15183b729a111f8da96517de 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
@@ -16,6 +16,9 @@ import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_4
 import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_5
 import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_6
 import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_7
+import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_8
+import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_9
+import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_10
 
 class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
 
@@ -71,7 +74,10 @@ class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, att
         tan_input_textview_4,
         tan_input_textview_5,
         tan_input_textview_6,
-        tan_input_textview_7
+        tan_input_textview_7,
+        tan_input_textview_8,
+        tan_input_textview_9,
+        tan_input_textview_10
     ).forEachIndexed { i, tanDigit ->
         tanDigit.text = digitAtIndex(i)
     }
diff --git a/Corona-Warn-App/src/main/res/layout/view_tan_input.xml b/Corona-Warn-App/src/main/res/layout/view_tan_input.xml
index 213e9ff71c18e439291b5c0443c14ff26fff0ae2..13d0453fbeb851bdd03df2babb1a34d251429d3f 100644
--- a/Corona-Warn-App/src/main/res/layout/view_tan_input.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_tan_input.xml
@@ -72,10 +72,36 @@
             android:id="@+id/tan_input_textview_7"
             style="@style/tanInputDigit"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tan_input_textview_8"
             app:layout_constraintStart_toEndOf="@+id/tan_input_textview_6"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="X" />
 
+        <TextView
+            android:id="@+id/tan_input_textview_8"
+            style="@style/tanInputDigit"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tan_input_textview_9"
+            app:layout_constraintStart_toEndOf="@+id/tan_input_textview_7"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="X" />
+
+        <TextView
+            android:id="@+id/tan_input_textview_9"
+            style="@style/tanInputDigit"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tan_input_textview_10"
+            app:layout_constraintStart_toEndOf="@+id/tan_input_textview_8"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="X" />
+
+        <TextView
+            android:id="@+id/tan_input_textview_10"
+            style="@style/tanInputDigit"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/tan_input_textview_9"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="X" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/Corona-Warn-App/src/main/res/values/dimens.xml b/Corona-Warn-App/src/main/res/values/dimens.xml
index 141c37f5ef19bd94a32cd72e2a047749c7a274d0..228ca5a2929e2c1641855a8dddfef1e3db513678 100644
--- a/Corona-Warn-App/src/main/res/values/dimens.xml
+++ b/Corona-Warn-App/src/main/res/values/dimens.xml
@@ -80,7 +80,7 @@
     <!-- Submission Tan Input -->
     <dimen name="submission_tan_input_edittext_size">1dp</dimen>
     <dimen name="submission_tan_input_digit_radius">2dp</dimen>
-    <dimen name="submission_tan_input_digit_width">36dp</dimen>
+    <dimen name="submission_tan_input_digit_width">26dp</dimen>
     <dimen name="submission_tan_input_digit_height">50dp</dimen>
 
     <!-- Submission QR Code Scan -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 55a1ff5c6e31ca9be4caa32622d56f9fa15c11ca..bd8cd1b5a5d8c6bbea7abbdf92a81f01f71f5de8 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -621,7 +621,7 @@
     <!-- XHED: Page title for TAN submission pge -->
     <string name="submission_tan_title">TAN Eingabe</string>
     <!-- YTXT: Body text for the tan submission page -->
-    <string name="submission_tan_body">Die TAN ist 7-stellig und Groß- und Kleinschreibung muss beachtet werden.\n\nGeben Sie bitte die Ihnen mitgeteilte TAN ein:</string>
+    <string name="submission_tan_body">Die TAN ist 10-stellig und Groß- und Kleinschreibung muss beachtet werden.\n\nGeben Sie bitte die Ihnen mitgeteilte TAN ein:</string>
     <!-- XBUT: Submit TAN button -->
     <string name="submission_tan_button_text">Weiter</string>