diff --git a/app/src/main/res/layout/credit_card_fragment.xml b/app/src/main/res/layout/credit_card_fragment.xml
index 14606fdc89..82659a09fa 100644
--- a/app/src/main/res/layout/credit_card_fragment.xml
+++ b/app/src/main/res/layout/credit_card_fragment.xml
@@ -38,6 +38,7 @@
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="36dp"
         android:hint="@string/CreditCardFragment__card_number"
+        android:theme="@style/Signal.ThemeOverlay.TextInputLayout"
         app:errorEnabled="true"
         app:layout_constraintTop_toBottomOf="@id/description">
 
@@ -65,6 +66,7 @@
         android:layout_marginTop="18dp"
         android:hint="@string/CreditCardFragment__mm_yy"
         android:paddingEnd="18dp"
+        android:theme="@style/Signal.ThemeOverlay.TextInputLayout"
         app:errorEnabled="true"
         app:layout_constraintEnd_toStartOf="@id/card_cvv_wrapper"
         app:layout_constraintStart_toStartOf="parent"
@@ -92,6 +94,7 @@
         android:layout_marginEnd="24dp"
         android:hint="@string/CreditCardFragment__cvv"
         android:paddingStart="18dp"
+        android:theme="@style/Signal.ThemeOverlay.TextInputLayout"
         app:errorEnabled="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/card_expiry_wrapper"
diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index 2a0da0e844..d67d9451c3 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -39,11 +39,11 @@
         android:id="@+id/username_box_fill"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@drawable/username_edit_box_fill"
         android:layout_marginRight="@dimen/dsl_settings_gutter"
+        android:background="@drawable/username_edit_box_fill"
         app:layout_constraintBottom_toBottomOf="@id/username_text_wrapper"
-        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toLeftOf="@id/username_text_wrapper"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@id/username_text_wrapper" />
 
     <com.google.android.material.textfield.TextInputLayout
@@ -54,14 +54,15 @@
         android:layout_marginLeft="@dimen/dsl_settings_gutter"
         android:layout_marginTop="24dp"
         android:layout_marginRight="16dp"
+        android:theme="@style/Signal.ThemeOverlay.TextInputLayout"
         app:boxStrokeColor="@color/signal_colorPrimary"
         app:boxStrokeWidth="0dp"
         app:boxStrokeWidthFocused="0dp"
         app:errorTextAppearance="@style/Signal.Text.Zero"
         app:expandedHintEnabled="false"
         app:layout_constrainedWidth="true"
-        app:layout_constraintRight_toLeftOf="@id/suffix_progress"
         app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/suffix_progress"
         app:layout_constraintTop_toBottomOf="@id/summary"
         app:suffixTextColor="@color/signal_colorOnSurface">
 
@@ -74,9 +75,9 @@
             android:imeOptions="actionNext"
             android:importantForAutofill="no"
             android:inputType="text"
+            android:layoutDirection="ltr"
             android:maxLines="1"
-            android:minHeight="56dp"
-            android:layoutDirection="ltr">
+            android:minHeight="56dp">
 
             <requestFocus />
         </EditText>
@@ -130,8 +131,8 @@
         android:layout_height="2dp"
         android:background="@color/signal_colorPrimary"
         app:layout_constraintBottom_toBottomOf="@id/username_text_wrapper"
-        app:layout_constraintRight_toRightOf="@id/discriminator_text"
-        app:layout_constraintLeft_toLeftOf="@id/username_text_wrapper" />
+        app:layout_constraintLeft_toLeftOf="@id/username_text_wrapper"
+        app:layout_constraintRight_toRightOf="@id/discriminator_text" />
 
     <TextView
         android:id="@+id/username_error"
@@ -142,8 +143,8 @@
         android:layout_marginTop="4dp"
         android:textColor="@color/signal_colorError"
         android:visibility="gone"
-        app:layout_constraintRight_toRightOf="@id/username_description"
         app:layout_constraintLeft_toLeftOf="@id/username_description"
+        app:layout_constraintRight_toRightOf="@id/username_description"
         app:layout_constraintTop_toBottomOf="@id/username_text_wrapper"
         tools:text="Error something bad happened. Very super long error message that wraps"
         tools:visibility="visible" />
@@ -159,8 +160,8 @@
         android:text="@string/UsernameEditFragment__choose_your_username"
         android:textAppearance="@style/Signal.Text.BodyLarge"
         android:textColor="@color/signal_colorOnSurfaceVariant"
-        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/icon" />
 
     <org.thoughtcrime.securesms.util.views.LearnMoreTextView