diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml
index 1af9824a34..75b5b5cd52 100644
--- a/app/src/main/res/layout/base_kbs_pin_fragment.xml
+++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml
@@ -49,7 +49,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/edit_kbs_textinputlayout"
-            style="@style/Widget.Signal.TextInputLayout.Registration"
+            style="@style/Widget.Signal.TextInputLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
diff --git a/app/src/main/res/layout/credit_card_fragment.xml b/app/src/main/res/layout/credit_card_fragment.xml
index 1b31a3f948..14606fdc89 100644
--- a/app/src/main/res/layout/credit_card_fragment.xml
+++ b/app/src/main/res/layout/credit_card_fragment.xml
@@ -32,17 +32,13 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/card_number_wrapper"
-        style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="36dp"
         android:hint="@string/CreditCardFragment__card_number"
-        app:boxStrokeColor="@color/signal_colorPrimary"
-        app:boxStrokeErrorColor="@color/signal_colorError"
         app:errorEnabled="true"
-        app:errorIconTint="@color/signal_colorError"
-        app:errorTextColor="@color/signal_colorError"
-        app:hintTextColor="@color/signal_colorPrimary"
         app:layout_constraintTop_toBottomOf="@id/description">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -53,24 +49,23 @@
             android:imeOptions="actionNext"
             android:inputType="number"
             android:maxLines="1"
-            android:nextFocusDown="@id/card_expiry" />
+            android:nextFocusDown="@id/card_expiry">
+
+            <requestFocus />
+        </com.google.android.material.textfield.TextInputEditText>
 
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/card_expiry_wrapper"
-        style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="18dp"
         android:hint="@string/CreditCardFragment__mm_yy"
         android:paddingEnd="18dp"
-        app:boxStrokeColor="@color/signal_colorPrimary"
-        app:boxStrokeErrorColor="@color/signal_colorError"
         app:errorEnabled="true"
-        app:errorIconTint="@color/signal_colorError"
-        app:errorTextColor="@color/signal_colorError"
-        app:hintTextColor="@color/signal_colorPrimary"
         app:layout_constraintEnd_toStartOf="@id/card_cvv_wrapper"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/card_number_wrapper">
@@ -90,18 +85,14 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/card_cvv_wrapper"
-        style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="18dp"
+        android:layout_marginEnd="24dp"
         android:hint="@string/CreditCardFragment__cvv"
         android:paddingStart="18dp"
-        app:boxStrokeColor="@color/signal_colorPrimary"
-        app:boxStrokeErrorColor="@color/signal_colorError"
         app:errorEnabled="true"
-        app:errorIconTint="@color/signal_colorError"
-        app:errorTextColor="@color/signal_colorError"
-        app:hintTextColor="@color/signal_colorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/card_expiry_wrapper"
         app:layout_constraintTop_toBottomOf="@id/card_number_wrapper">
diff --git a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
index abdb736594..858daeade6 100644
--- a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
@@ -57,7 +57,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/number"
-                style="@style/Widget.Signal.TextInputLayout.Registration"
+                style="@style/Widget.Signal.TextInputLayout"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/pin_restore_entry_fragment.xml b/app/src/main/res/layout/pin_restore_entry_fragment.xml
index 27e23e9e8c..cc9b33beee 100644
--- a/app/src/main/res/layout/pin_restore_entry_fragment.xml
+++ b/app/src/main/res/layout/pin_restore_entry_fragment.xml
@@ -43,7 +43,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/edit_kbs_textinputlayout"
-            style="@style/Widget.Signal.TextInputLayout.Registration"
+            style="@style/Widget.Signal.TextInputLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
diff --git a/app/src/main/res/layout/profile_create_fragment.xml b/app/src/main/res/layout/profile_create_fragment.xml
index d6790ff7cc..2579c6f74c 100644
--- a/app/src/main/res/layout/profile_create_fragment.xml
+++ b/app/src/main/res/layout/profile_create_fragment.xml
@@ -135,7 +135,7 @@
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/given_name_wrapper"
-                        style="@style/Widget.Signal.TextInputLayout.Registration"
+                        style="@style/Widget.Signal.TextInputLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="24dp"
@@ -170,7 +170,7 @@
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/family_name_wrapper"
-                        style="@style/Widget.Signal.TextInputLayout.Registration"
+                        style="@style/Widget.Signal.TextInputLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="24dp"
diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index a10db198f5..60bd79287d 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -36,7 +36,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/username_text_wrapper"
-        style="@style/Widget.Signal.TextInputLayout.Registration"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dsl_settings_gutter"
diff --git a/app/src/main/res/layout/verification_code_view.xml b/app/src/main/res/layout/verification_code_view.xml
index 97298c516b..f134e07bae 100644
--- a/app/src/main/res/layout/verification_code_view.xml
+++ b/app/src/main/res/layout/verification_code_view.xml
@@ -10,7 +10,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/container_zero"
-        style="@style/Widget.Signal.TextInputLayout.Registration"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:errorEnabled="false"
@@ -39,7 +39,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/container_one"
-        style="@style/Widget.Signal.TextInputLayout.Registration"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="4dp"
@@ -69,7 +69,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/container_two"
-        style="@style/Widget.Signal.TextInputLayout.Registration"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="4dp"
@@ -116,7 +116,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/container_three"
-        style="@style/Widget.Signal.TextInputLayout.Registration"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="4dp"
@@ -146,7 +146,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/container_four"
-        style="@style/Widget.Signal.TextInputLayout.Registration"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="4dp"
@@ -176,7 +176,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/container_five"
-        style="@style/Widget.Signal.TextInputLayout.Registration"
+        style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="4dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f2b69a4c1a..ffc6ff9775 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -59,7 +59,7 @@
         <item name="android:windowBackground">@drawable/dialog_background</item>
         <item name="android:textColor">@null</item>
     </style>
-    
+
     <style name="TextSecure.Animation.FullScreenDialog" parent="@android:style/Animation.Activity">
         <item name="android:windowEnterAnimation">@anim/fade_scale_in</item>
         <item name="android:windowExitAnimation">@anim/fade_scale_out</item>
@@ -371,10 +371,16 @@
         <item name="hintTextAppearance">@style/Signal.Text.LabelMedium</item>
     </style>
 
-    <style name="Widget.Signal.TextInputLayout.Registration" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
+    <style name="Widget.Signal.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
         <item name="boxCornerRadiusTopEnd">4dp</item>
         <item name="boxCornerRadiusTopStart">4dp</item>
         <item name="hintTextAppearance">@style/Signal.Text.LabelMedium</item>
+        <item name="boxStrokeColor">@color/signal_colorPrimary</item>
+        <item name="boxStrokeErrorColor">@color/signal_colorError</item>
+        <item name="errorIconTint">@color/signal_colorError</item>
+        <item name="errorTextColor">@color/signal_colorError</item>
+        <item name="hintTextColor">@color/signal_colorPrimary</item>
+        <item name="boxBackgroundColor">@color/signal_colorSurfaceVariant</item>
     </style>
 
     <style name="Widget.Signal.TextInputLayout.Registration.Dropdown" parent="Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">