diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index 737a043bda..2a0da0e844 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -40,10 +40,10 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@drawable/username_edit_box_fill"
-        android:layout_marginEnd="@dimen/dsl_settings_gutter"
+        android:layout_marginRight="@dimen/dsl_settings_gutter"
         app:layout_constraintBottom_toBottomOf="@id/username_text_wrapper"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/username_text_wrapper"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/username_text_wrapper"
         app:layout_constraintTop_toTopOf="@id/username_text_wrapper" />
 
     <com.google.android.material.textfield.TextInputLayout
@@ -51,17 +51,17 @@
         style="@style/Widget.Signal.TextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dsl_settings_gutter"
+        android:layout_marginLeft="@dimen/dsl_settings_gutter"
         android:layout_marginTop="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         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_constraintEnd_toStartOf="@id/suffix_progress"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/suffix_progress"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/summary"
         app:suffixTextColor="@color/signal_colorOnSurface">
 
@@ -75,7 +75,8 @@
             android:importantForAutofill="no"
             android:inputType="text"
             android:maxLines="1"
-            android:minHeight="56dp">
+            android:minHeight="56dp"
+            android:layoutDirection="ltr">
 
             <requestFocus />
         </EditText>
@@ -98,19 +99,19 @@
         android:paddingHorizontal="16dp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="@id/username_text_wrapper"
-        app:layout_constraintEnd_toEndOf="@id/username_box_fill"
+        app:layout_constraintRight_toRightOf="@id/username_box_fill"
         tools:text="21" />
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/suffix_progress"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginBottom="10dp"
         app:indicatorColor="@color/signal_colorOnSurfaceVariant"
         app:indicatorSize="16dp"
         app:layout_constraintBottom_toBottomOf="@id/username_text_wrapper"
-        app:layout_constraintEnd_toStartOf="@id/discriminator_text"
+        app:layout_constraintRight_toLeftOf="@id/discriminator_text"
         app:trackColor="@color/transparent"
         app:trackThickness="1.75dp" />
 
@@ -120,7 +121,7 @@
         android:layout_height="20dp"
         android:background="@color/signal_colorOutline"
         app:layout_constraintBottom_toBottomOf="@id/discriminator_text"
-        app:layout_constraintStart_toStartOf="@id/discriminator_text"
+        app:layout_constraintLeft_toLeftOf="@id/discriminator_text"
         app:layout_constraintTop_toTopOf="@id/discriminator_text" />
 
     <View
@@ -129,8 +130,8 @@
         android:layout_height="2dp"
         android:background="@color/signal_colorPrimary"
         app:layout_constraintBottom_toBottomOf="@id/username_text_wrapper"
-        app:layout_constraintEnd_toEndOf="@id/discriminator_text"
-        app:layout_constraintStart_toStartOf="@id/username_text_wrapper" />
+        app:layout_constraintRight_toRightOf="@id/discriminator_text"
+        app:layout_constraintLeft_toLeftOf="@id/username_text_wrapper" />
 
     <TextView
         android:id="@+id/username_error"
@@ -141,8 +142,8 @@
         android:layout_marginTop="4dp"
         android:textColor="@color/signal_colorError"
         android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@id/username_description"
-        app:layout_constraintStart_toStartOf="@id/username_description"
+        app:layout_constraintRight_toRightOf="@id/username_description"
+        app:layout_constraintLeft_toLeftOf="@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" />
@@ -158,8 +159,8 @@
         android:text="@string/UsernameEditFragment__choose_your_username"
         android:textAppearance="@style/Signal.Text.BodyLarge"
         android:textColor="@color/signal_colorOnSurfaceVariant"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/icon" />
 
     <org.thoughtcrime.securesms.util.views.LearnMoreTextView