diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml
index 47f58f170..4bd13c7d8 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -20,6 +20,7 @@
       style="?fontBody1"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:hint="@string/name"
       android:textColorHint="?android:textColorSecondary"
       app:endIconMode="custom"
       app:endIconCheckable="false"
@@ -31,7 +32,6 @@
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/name"
         android:padding="@dimen/margin_half_double_plus"
         android:textAlignment="viewStart"
         android:inputType="textCapSentences"
@@ -94,6 +94,7 @@
     android:layout_height="wrap_content"
     android:layout_below="@id/rl__bookmark_set"
     android:layout_margin="@dimen/margin_half"
+    android:hint="@string/placepage_personal_notes_hint"
     android:textColorHint="?android:textColorSecondary">
 
     <com.google.android.material.textfield.TextInputEditText
@@ -102,7 +103,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
-      android:hint="@string/placepage_personal_notes_hint"
       android:inputType="textMultiLine"
       android:textAlignment="viewStart" />
   </com.google.android.material.textfield.TextInputLayout>
diff --git a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
index feb312ca8..c7668793b 100644
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -33,6 +33,7 @@
           android:id="@+id/edit_list_name_input"
           app:hintAnimationEnabled="false"
           style="@style/MwmWidget.Editor.CustomTextInput"
+          android:hint="@string/list"
           android:textColorHint="?android:textColorSecondary"
           app:endIconMode="custom"
           app:endIconDrawable="@drawable/ic_clear_rounded"
@@ -40,7 +41,6 @@
         <com.google.android.material.textfield.TextInputEditText
           android:id="@+id/edit_list_name_view"
           style="@style/MwmWidget.Editor.CustomTextInput"
-          android:hint="@string/list"
           android:layout_width="match_parent"
           android:layout_height="wrap_content" />
         </com.google.android.material.textfield.TextInputLayout>
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index bd56f5c66..792973a98 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -66,18 +66,19 @@
       <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/osm_username_container"
         style="@style/MwmWidget.Editor.CustomTextInput"
+        android:hint="@string/email_or_username"
         android:textColorHint="?android:textColorSecondary"
         app:endIconMode="custom">
         <com.google.android.material.textfield.TextInputEditText
           android:id="@+id/osm_username"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
-          android:autofillHints="emailAddress"
-          android:hint="@string/email_or_username" />
+          android:autofillHints="emailAddress" />
       </com.google.android.material.textfield.TextInputLayout>
       <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/osm_password_container"
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_marginTop="@dimen/margin_base"
+        android:hint="@string/password"
         android:textColorHint="?android:textColorSecondary"
         app:endIconMode="password_toggle"
         app:endIconTint="?android:textColorSecondary">
@@ -85,7 +86,6 @@
           android:id="@+id/osm_password"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
           android:autofillHints="password"
-          android:hint="@string/password"
           android:inputType="textPassword" />
       </com.google.android.material.textfield.TextInputLayout>
       <FrameLayout
diff --git a/android/app/src/main/res/layout/item_localized_name.xml b/android/app/src/main/res/layout/item_localized_name.xml
index 66b869bdf..dd9d3dd20 100644
--- a/android/app/src/main/res/layout/item_localized_name.xml
+++ b/android/app/src/main/res/layout/item_localized_name.xml
@@ -14,11 +14,11 @@
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
+    android:hint="@string/editor_edit_place_name_hint"
     android:textColorHint="?android:textColorSecondary">
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/input"
       style="@style/MwmWidget.Editor.FieldLayout.EditText"
-      android:hint="@string/editor_edit_place_name_hint"
       android:inputType="textCapSentences"
       android:padding="@dimen/margin_base"
       android:singleLine="true"