diff --git a/app/src/main/res/layout/assistant_account_login_fragment.xml b/app/src/main/res/layout/assistant_account_login_fragment.xml
index 1bc9f5aff..5747ee59a 100644
--- a/app/src/main/res/layout/assistant_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_account_login_fragment.xml
@@ -110,43 +110,46 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/select_country">
 
-                        <TextView
-                            android:text="@string/phone_number"
-                            style="@style/assistant_input_field_header_font"
-                            android:textAllCaps="true"
-                            android:layout_marginTop="10dp"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"/>
-
                         <LinearLayout
                             android:orientation="horizontal"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
 
-                            <EditText
-                                assistantPhoneNumberPrefixValidation="@{true}"
-                                android:text="@={viewModel.prefix}"
-                                android:background="@drawable/resizable_text_field"
-                                android:textColor="@color/black_color"
-                                android:inputType="phone"
-                                android:layout_marginRight="10dp"
-                                android:gravity="center"
-                                android:layout_width="65dp"
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:layout_width="100dp"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/international_prefix"
-                                android:maxLines="1"/>
+                                android:layout_marginRight="10dp"
+                                android:hint="@string/international_prefix">
 
-                            <EditText
-                                assistantPhoneNumberValidation="@{true}"
-                                errorMessage="@={viewModel.phoneNumberError}"
-                                android:text="@={viewModel.phoneNumber}"
-                                android:background="@drawable/resizable_text_field"
-                                android:textColor="@color/black_color"
-                                android:inputType="phone"
+                                <com.google.android.material.textfield.TextInputEditText
+                                    assistantPhoneNumberPrefixValidation="@{true}"
+                                    android:text="@={viewModel.prefix}"
+                                    android:imeOptions="actionDone"
+                                    android:singleLine="true"
+                                    android:inputType="phone"
+                                    android:background="@color/transparent_color"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"/>
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                            <com.google.android.material.textfield.TextInputLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/phone_number"
-                                android:maxLines="1"/>
+                                android:hint="@string/phone_number">
+
+                                <com.google.android.material.textfield.TextInputEditText
+                                    assistantPhoneNumberValidation="@{true}"
+                                    errorMessage="@={viewModel.phoneNumberError}"
+                                    android:text="@={viewModel.phoneNumber}"
+                                    android:imeOptions="actionDone"
+                                    android:singleLine="true"
+                                    android:inputType="phone"
+                                    android:background="@color/transparent_color"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"/>
+
+                            </com.google.android.material.textfield.TextInputLayout>
 
                         </LinearLayout>
 
@@ -154,88 +157,68 @@
 
                 </RelativeLayout>
 
-                <RelativeLayout
+                <LinearLayout
                     android:visibility="@{viewModel.loginWithUsernamePassword ? View.VISIBLE: View.GONE}"
                     android:layout_marginBottom="5dp"
                     android:paddingTop="10dp"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
                     <TextView
-                        android:id="@+id/username_desc"
                         style="@style/standard_small_text_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:layout_alignParentTop="true"
                         android:paddingTop="10dp"
                         android:text="@string/assistant_linphone_login_desc" />
 
-                    <LinearLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/username_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:layout_below="@id/username_desc"
-                        android:orientation="vertical">
+                        android:layout_marginTop="16dp"
+                        android:hint="@string/username">
 
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/username"
-                            android:textAllCaps="true" />
-
-                        <EditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:text="@={viewModel.username}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
+                            android:imeOptions="actionDone"
+                            android:singleLine="true"
                             android:inputType="text|textNoSuggestions"
-                            android:maxLines="1"
-                            android:hint="@string/username"
-                            android:textColor="@color/black_color" />
+                            android:background="@color/transparent_color"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
 
-                    </LinearLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <LinearLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:layout_below="@id/username_layout"
-                        android:orientation="vertical">
+                        android:hint="@string/password">
 
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/password"
-                            android:textAllCaps="true" />
-
-                        <EditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:text="@={viewModel.password}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
+                            android:imeOptions="actionDone"
+                            android:singleLine="true"
                             android:inputType="textPassword"
-                            android:maxLines="1"
-                            android:hint="@string/password"
-                            android:textColor="@color/black_color" />
+                            android:background="@color/transparent_color"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
 
-                        <TextView
-                            android:onClick="@{forgotPasswordClickListener}"
-                            android:textColor="?attr/accentColor"
-                            android:textSize="8sp"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:gravity="center"
-                            android:paddingTop="5dp"
-                            android:text="@string/assistant_login_forgotten_password" />
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    </LinearLayout>
+                    <TextView
+                        android:onClick="@{forgotPasswordClickListener}"
+                        android:textColor="?attr/accentColor"
+                        android:textSize="8sp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:gravity="right"
+                        android:paddingTop="6dp"
+                        android:text="@string/assistant_login_forgotten_password" />
 
-                </RelativeLayout>
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/assistant_country_picker_fragment.xml b/app/src/main/res/layout/assistant_country_picker_fragment.xml
index a6f16fe00..97c277861 100644
--- a/app/src/main/res/layout/assistant_country_picker_fragment.xml
+++ b/app/src/main/res/layout/assistant_country_picker_fragment.xml
@@ -31,16 +31,22 @@
             android:layout_height="wrap_content"
             android:layout_margin="10dp">
 
-            <EditText
-                android:id="@+id/search_country"
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_toLeftOf="@id/clear_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_toLeftOf="@id/clear_field"
-                android:gravity="center"
-                android:inputType="textPersonName"
-                android:hint="@string/assistant_choose_country"
-                android:textColor="@color/black_color"
-                android:textCursorDrawable="@null" />
+                android:hint="@string/assistant_choose_country">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/search_country"
+                    android:imeOptions="actionDone"
+                    android:singleLine="true"
+                    android:inputType="textPersonName"
+                    android:background="@color/transparent_color"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <ImageView
                 android:id="@+id/clear_field"
diff --git a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml b/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
index 36e28f60a..0730daa87 100644
--- a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
+++ b/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
@@ -52,128 +52,77 @@
                     android:paddingTop="20dp"
                     android:text="@string/assistant_create_account_part_email" />
 
-                <GridLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:columnCount="1">
+                    android:layout_height="wrap_content"
+                    android:hint="@string/username">
 
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
+                    <com.google.android.material.textfield.TextInputEditText
+                        assistantUsernameValidation="@{true}"
+                        errorMessage="@={viewModel.usernameError}"
+                        android:text="@={viewModel.username}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="text|textNoSuggestions"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
 
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/username"
-                            android:textAllCaps="true" />
+                </com.google.android.material.textfield.TextInputLayout>
 
-                        <EditText
-                            assistantUsernameValidation="@{true}"
-                            errorMessage="@={viewModel.usernameError}"
-                            android:text="@={viewModel.username}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="text|textNoSuggestions"
-                            android:maxLines="1"
-                            android:hint="@string/username"
-                            android:textColor="@color/black_color" />
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/email">
 
-                    </LinearLayout>
+                    <com.google.android.material.textfield.TextInputEditText
+                        errorMessage="@={viewModel.emailError}"
+                        emailConfirmationValidation="@{true}"
+                        android:text="@={viewModel.email}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="text|textEmailAddress"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
 
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
+                </com.google.android.material.textfield.TextInputLayout>
 
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/email"
-                            android:textAllCaps="true" />
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/password">
 
-                        <EditText
-                            errorMessage="@={viewModel.emailError}"
-                            emailConfirmationValidation="@{true}"
-                            android:text="@={viewModel.email}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="text|textEmailAddress"
-                            android:maxLines="1"
-                            android:hint="@string/email"
-                            android:textColor="@color/black_color" />
+                    <com.google.android.material.textfield.TextInputEditText
+                        errorMessage="@={viewModel.passwordError}"
+                        passwordConfirmationValidation="@{passwordConfirmation}"
+                        android:text="@={viewModel.password}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="textPassword"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
 
-                    </LinearLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/assistant_confirm_password">
 
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/password"
-                            android:textAllCaps="true" />
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/password_confirmation"
+                        errorMessage="@={viewModel.passwordConfirmationError}"
+                        android:text="@={viewModel.passwordConfirmation}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="textPassword"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
 
-                        <EditText
-                            errorMessage="@={viewModel.passwordError}"
-                            passwordConfirmationValidation="@{passwordConfirmation}"
-                            android:text="@={viewModel.password}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="textPassword"
-                            android:maxLines="1"
-                            android:hint="@string/password"
-                            android:textColor="@color/black_color" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
-
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/assistant_confirm_password"
-                            android:textAllCaps="true" />
-
-                        <EditText
-                            android:id="@+id/password_confirmation"
-                            errorMessage="@={viewModel.passwordConfirmationError}"
-                            android:text="@={viewModel.passwordConfirmation}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="textPassword"
-                            android:maxLines="1"
-                            android:hint="@string/assistant_confirm_password"
-                            android:textColor="@color/black_color" />
-
-                    </LinearLayout>
-
-                </GridLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
                     android:onClick="@{() -> viewModel.create()}"
diff --git a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml b/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
index 951a80811..dbfe35d25 100644
--- a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
@@ -31,6 +31,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:padding="10dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -52,172 +53,120 @@
                     android:paddingTop="20dp"
                     android:text="@string/assistant_login_desc" />
 
-                <GridLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:columnCount="1">
+                    android:layout_height="wrap_content"
+                    android:hint="@string/username">
 
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:text="@={viewModel.username}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="text|textNoSuggestions"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/password">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:text="@={viewModel.password}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="textPassword"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/domain">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:text="@={viewModel.domain}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="textUri"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/assistant_display_name_optional">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:text="@={viewModel.displayName}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="textPersonName"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <RadioGroup
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:padding="10dp"
-                        android:orientation="vertical">
+                        android:gravity="center"
+                        android:orientation="horizontal">
 
                         <TextView
                             style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/username"
-                            android:textAllCaps="true" />
-
-                        <EditText
-                            android:text="@={viewModel.username}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="text|textNoSuggestions"
-                            android:maxLines="1"
-                            android:hint="@string/username"
-                            android:textColor="@color/black_color" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
-
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/password"
-                            android:textAllCaps="true" />
-
-                        <EditText
-                            android:text="@={viewModel.password}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="textPassword"
-                            android:maxLines="1"
-                            android:hint="@string/password"
-                            android:textColor="@color/black_color" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
-
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/domain"
-                            android:textAllCaps="true" />
-
-                        <EditText
-                            android:text="@={viewModel.domain}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="textUri"
-                            android:maxLines="1"
-                            android:hint="@string/domain"
-                            android:textColor="@color/black_color" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
-
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/assistant_display_name_optional"
-                            android:textAllCaps="true" />
-
-                        <EditText
-                            android:text="@={viewModel.displayName}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/resizable_text_field"
-                            android:inputType="textPersonName"
-                            android:maxLines="1"
-                            android:hint="@string/assistant_display_name_optional"
-                            android:textColor="@color/black_color" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:orientation="vertical">
-
-                        <TextView
-                            style="@style/assistant_input_field_header_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
                             android:text="@string/transport"
                             android:textAllCaps="true" />
 
-                        <RadioGroup
-                            android:layout_width="match_parent"
+                        <com.google.android.material.radiobutton.MaterialRadioButton
+                            android:checked="@{viewModel.transport == TransportType.Udp}"
+                            android:onClick="@{() -> viewModel.setTransport(TransportType.Udp)}"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:orientation="horizontal">
+                            android:layout_margin="5dp"
+                            android:textColor="?attr/primaryTextColor"
+                            android:text="@string/transport_udp" />
 
-                            <RadioButton
-                                android:checked="@{viewModel.transport == TransportType.Udp}"
-                                android:onClick="@{() -> viewModel.setTransport(TransportType.Udp)}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_margin="5dp"
-                                android:textColor="?attr/primaryTextColor"
-                                android:text="@string/transport_udp" />
+                        <com.google.android.material.radiobutton.MaterialRadioButton
+                            android:checked="@{viewModel.transport == TransportType.Tcp}"
+                            android:onClick="@{() -> viewModel.setTransport(TransportType.Tcp)}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="5dp"
+                            android:textColor="?attr/primaryTextColor"
+                            android:text="@string/transport_tcp" />
 
-                            <RadioButton
-                                android:checked="@{viewModel.transport == TransportType.Tcp}"
-                                android:onClick="@{() -> viewModel.setTransport(TransportType.Tcp)}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_margin="5dp"
-                                android:textColor="?attr/primaryTextColor"
-                                android:text="@string/transport_tcp" />
+                        <com.google.android.material.radiobutton.MaterialRadioButton
+                            android:checked="@{viewModel.transport == TransportType.Tls}"
+                            android:onClick="@{() -> viewModel.setTransport(TransportType.Tls)}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="5dp"
+                            android:textColor="?attr/primaryTextColor"
+                            android:text="@string/transport_tls" />
 
-                            <RadioButton
-                                android:checked="@{viewModel.transport == TransportType.Tls}"
-                                android:onClick="@{() -> viewModel.setTransport(TransportType.Tls)}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_margin="5dp"
-                                android:textColor="?attr/primaryTextColor"
-                                android:text="@string/transport_tls" />
+                    </RadioGroup>
 
-                        </RadioGroup>
-
-                    </LinearLayout>
-
-                </GridLayout>
+                </LinearLayout>
 
                 <TextView
                     android:onClick="@{() -> viewModel.createProxyConfig()}"
diff --git a/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml b/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
index 780c5cbb4..e7e0c6617 100644
--- a/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
+++ b/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
@@ -106,30 +106,41 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
 
-                            <EditText
-                                assistantPhoneNumberPrefixValidation="@{true}"
-                                android:text="@={viewModel.prefix}"
-                                android:background="@drawable/resizable_text_field"
-                                android:textColor="@color/black_color"
-                                android:inputType="phone"
-                                android:layout_marginRight="10dp"
-                                android:gravity="center"
-                                android:layout_width="65dp"
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:layout_width="100dp"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/international_prefix"
-                                android:maxLines="1"/>
+                                android:layout_marginRight="10dp"
+                                android:hint="@string/international_prefix">
 
-                            <EditText
-                                assistantPhoneNumberValidation="@{true}"
-                                errorMessage="@={viewModel.phoneNumberError}"
-                                android:text="@={viewModel.phoneNumber}"
-                                android:background="@drawable/resizable_text_field"
-                                android:textColor="@color/black_color"
-                                android:inputType="phone"
+                                <com.google.android.material.textfield.TextInputEditText
+                                    assistantPhoneNumberPrefixValidation="@{true}"
+                                    android:text="@={viewModel.prefix}"
+                                    android:imeOptions="actionDone"
+                                    android:singleLine="true"
+                                    android:inputType="phone"
+                                    android:background="@color/transparent_color"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"/>
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                            <com.google.android.material.textfield.TextInputLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/phone_number"
-                                android:maxLines="1"/>
+                                android:hint="@string/phone_number">
+
+                                <com.google.android.material.textfield.TextInputEditText
+                                    assistantPhoneNumberValidation="@{true}"
+                                    errorMessage="@={viewModel.phoneNumberError}"
+                                    android:text="@={viewModel.phoneNumber}"
+                                    android:imeOptions="actionDone"
+                                    android:singleLine="true"
+                                    android:inputType="phone"
+                                    android:background="@color/transparent_color"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"/>
+
+                            </com.google.android.material.textfield.TextInputLayout>
 
                         </LinearLayout>
 
@@ -154,18 +165,24 @@
 
                         </LinearLayout>
 
-                        <EditText
-                            assistantUsernameValidation="@{true}"
-                            errorMessage="@={viewModel.usernameError}"
-                            android:text="@={viewModel.username}"
+                        <com.google.android.material.textfield.TextInputLayout
                             android:visibility="@{viewModel.useUsername ? View.VISIBLE : View.GONE}"
-                            android:background="@drawable/resizable_text_field"
-                            android:textColor="@color/black_color"
-                            android:inputType="text|textNoSuggestions"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="@string/username"
-                            android:maxLines="1"/>
+                            android:hint="@string/username">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                assistantUsernameValidation="@{true}"
+                                errorMessage="@={viewModel.usernameError}"
+                                android:text="@={viewModel.username}"
+                                android:imeOptions="actionDone"
+                                android:singleLine="true"
+                                android:inputType="text|textNoSuggestions"
+                                android:background="@color/transparent_color"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+
+                        </com.google.android.material.textfield.TextInputLayout>
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml b/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
index be0bb23cb..449220c4c 100644
--- a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
+++ b/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
@@ -116,30 +116,41 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/select_country">
 
-                        <EditText
-                            assistantPhoneNumberPrefixValidation="@{true}"
-                            android:background="@drawable/resizable_text_field"
-                            android:textColor="@color/black_color"
-                            android:inputType="phone"
-                            android:text="@={viewModel.prefix}"
-                            android:layout_marginRight="10dp"
-                            android:gravity="center"
-                            android:layout_width="65dp"
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:layout_width="100dp"
                             android:layout_height="wrap_content"
-                            android:hint="@string/international_prefix"
-                            android:maxLines="1"/>
+                            android:layout_marginRight="10dp"
+                            android:hint="@string/international_prefix">
 
-                        <EditText
-                            assistantPhoneNumberValidation="@{true}"
-                            errorMessage="@={viewModel.phoneNumberError}"
-                            android:text="@={viewModel.phoneNumber}"
-                            android:background="@drawable/resizable_text_field"
-                            android:textColor="@color/black_color"
-                            android:inputType="phone"
+                            <com.google.android.material.textfield.TextInputEditText
+                                assistantPhoneNumberPrefixValidation="@{true}"
+                                android:text="@={viewModel.prefix}"
+                                android:imeOptions="actionDone"
+                                android:singleLine="true"
+                                android:inputType="phone"
+                                android:background="@color/transparent_color"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="@string/phone_number"
-                            android:maxLines="1"/>
+                            android:hint="@string/phone_number">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                assistantPhoneNumberValidation="@{true}"
+                                errorMessage="@={viewModel.phoneNumberError}"
+                                android:text="@={viewModel.phoneNumber}"
+                                android:imeOptions="actionDone"
+                                android:singleLine="true"
+                                android:inputType="phone"
+                                android:background="@color/transparent_color"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+
+                        </com.google.android.material.textfield.TextInputLayout>
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/assistant_phone_account_validation_fragment.xml b/app/src/main/res/layout/assistant_phone_account_validation_fragment.xml
index ecc761c73..2d0aba0d5 100644
--- a/app/src/main/res/layout/assistant_phone_account_validation_fragment.xml
+++ b/app/src/main/res/layout/assistant_phone_account_validation_fragment.xml
@@ -87,16 +87,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-            <EditText
-                android:text="@={viewModel.code}"
-                android:background="@drawable/resizable_text_field"
-                android:textColor="@color/black_color"
-                android:inputType="number"
-                android:gravity="center_vertical|center_horizontal"
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/assistant_confirmation_code"
-                android:maxLines="1"/>
+                android:hint="@string/assistant_confirmation_code">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:text="@={viewModel.code}"
+                    android:imeOptions="actionDone"
+                    android:singleLine="true"
+                    android:inputType="number"
+                    android:background="@color/transparent_color"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:onClick="@{() -> viewModel.finish()}"
diff --git a/app/src/main/res/layout/assistant_remote_provisioning_fragment.xml b/app/src/main/res/layout/assistant_remote_provisioning_fragment.xml
index acbf3cb76..84d818ad6 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning_fragment.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning_fragment.xml
@@ -52,25 +52,23 @@
                 android:paddingTop="10dp"
                 android:text="@string/assistant_remote_provisioning_desc" />
 
-            <TextView
-                android:text="@string/assistant_remote_provisioning_url"
-                style="@style/assistant_input_field_header_font"
-                android:textAllCaps="true"
-                android:paddingTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <EditText
-                errorMessage="@={viewModel.urlError}"
-                urlConfirmationValidation="@{true}"
-                android:text="@={viewModel.urlToFetch}"
-                android:background="@drawable/resizable_text_field"
-                android:textColor="@color/black_color"
-                android:inputType="textUri"
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/assistant_remote_provisioning_url"
-                android:maxLines="1"/>
+                android:hint="@string/assistant_remote_provisioning_url">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    errorMessage="@={viewModel.urlError}"
+                    urlConfirmationValidation="@{true}"
+                    android:text="@={viewModel.urlToFetch}"
+                    android:imeOptions="actionDone"
+                    android:singleLine="true"
+                    android:inputType="textUri"
+                    android:background="@color/transparent_color"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:onClick="@{() -> viewModel.fetchAndApply()}"
diff --git a/app/src/main/res/layout/chat_room_group_info_fragment.xml b/app/src/main/res/layout/chat_room_group_info_fragment.xml
index 7b9cebf58..5ef4b0f81 100644
--- a/app/src/main/res/layout/chat_room_group_info_fragment.xml
+++ b/app/src/main/res/layout/chat_room_group_info_fragment.xml
@@ -79,15 +79,23 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp">
 
-                <EditText
-                    android:text="@={viewModel.subject}"
-                    android:enabled="@{viewModel.meAdmin}"
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:gravity="center"
-                    android:hint="@string/chat_room_group_info_subject_hint"
-                    android:inputType="textEmailSubject"
-                    android:paddingRight="5dp" />
+                    android:layout_height="wrap_content"
+                    android:paddingRight="5dp"
+                    android:hint="@string/chat_room_group_info_subject_hint">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:text="@={viewModel.subject}"
+                        android:enabled="@{viewModel.meAdmin}"
+                        android:imeOptions="actionDone"
+                        android:singleLine="true"
+                        android:inputType="textEmailSubject"
+                        android:background="@color/transparent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+
+                </com.google.android.material.textfield.TextInputLayout>
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_widget_text.xml b/app/src/main/res/layout/settings_widget_text.xml
index 866c241d8..ff5f15524 100644
--- a/app/src/main/res/layout/settings_widget_text.xml
+++ b/app/src/main/res/layout/settings_widget_text.xml
@@ -47,7 +47,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@id/settings_clear_input"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="5dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:enabled="@{enabled ?? true}"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3eae3d66a..4d276b1e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,7 +30,7 @@
     <string name="phone_number">Phone number</string>
     <string name="phone_numbers">Phone numbers</string>
     <string name="select_your_country">Select your country</string>
-    <string name="international_prefix">International phone number prefix</string>
+    <string name="international_prefix">Prefix</string>
     <string name="assistant_choose_country">Choose a country</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 01a3f9a1c..4fc2f9f1a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,7 +62,7 @@
     <!-- Assistant related -->
 
     <style name="assistant_input_field_header_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primarySubtextLightColor</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">13sp</item>
     </style>