diff --git a/OsmAnd/res/layout/account_details.xml b/OsmAnd/res/layout/account_details.xml
new file mode 100644
index 0000000000..9e6e4497d7
--- /dev/null
+++ b/OsmAnd/res/layout/account_details.xml
@@ -0,0 +1,59 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/account_container"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:orientation="horizontal">
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/account_icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/content_padding_small"
+		android:tint="?attr/default_icon_color"
+		osmand:srcCompat="@drawable/ic_action_user_account" />
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/subHeaderPadding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/subHeaderPadding"
+		android:orientation="vertical">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/account_title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:minHeight="@dimen/default_desc_line_height"
+			android:text="@string/login_account"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:lineHeight="@dimen/default_desc_line_height"
+			osmand:typeface="@string/font_roboto_regular" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/user_name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:minHeight="@dimen/default_title_line_height"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:lineHeight="@dimen/default_title_line_height"
+			osmand:typeface="@string/font_roboto_regular"
+			tools:text="SomeVeryLongLoginWithTooManyCharacters" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/open_osm_note_text.xml b/OsmAnd/res/layout/open_osm_note_text.xml
new file mode 100644
index 0000000000..c3bb2dccd8
--- /dev/null
+++ b/OsmAnd/res/layout/open_osm_note_text.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical">
+
+	<com.google.android.material.textfield.TextInputLayout
+		android:id="@+id/name_text_box"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/shared_string_name"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingStart="@dimen/content_padding"
+		app:boxBackgroundColor="?attr/text_input_background"
+		app:boxStrokeColor="@color/osmand_orange"
+		app:hintTextColor="@color/text_color_secondary_light">
+
+		<com.google.android.material.textfield.TextInputEditText
+			android:id="@+id/name_edit_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+			android:imeOptions="actionDone"/>
+
+	</com.google.android.material.textfield.TextInputLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osm_login_data.xml b/OsmAnd/res/layout/osm_login_data.xml
index 4679608265..363287fe72 100644
--- a/OsmAnd/res/layout/osm_login_data.xml
+++ b/OsmAnd/res/layout/osm_login_data.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -29,7 +30,10 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
-		android:hint="@string/user_login">
+		android:hint="@string/user_login"
+		app:boxBackgroundColor="?attr/text_input_background"
+		app:boxStrokeColor="@color/osmand_orange"
+		app:hintTextColor="@color/text_color_secondary_light">
 
 		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/name_edit_text"
@@ -43,7 +47,10 @@
 		android:id="@+id/password_text_box"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:hint="@string/user_password">
+		android:hint="@string/user_password"
+		app:boxBackgroundColor="?attr/text_input_background"
+		app:boxStrokeColor="@color/osmand_orange"
+		app:hintTextColor="@color/text_color_secondary_light">
 
 		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/password_edit_text"
diff --git a/OsmAnd/res/layout/send_gpx_fragment.xml b/OsmAnd/res/layout/send_gpx_fragment.xml
index f079141e17..795b169300 100644
--- a/OsmAnd/res/layout/send_gpx_fragment.xml
+++ b/OsmAnd/res/layout/send_gpx_fragment.xml
@@ -33,13 +33,13 @@
 			android:layout_height="wrap_content"
 			android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
 			android:hint="@string/shared_string_description"
+			app:boxBackgroundColor="?attr/text_input_background"
 			app:boxStrokeColor="@color/osmand_orange"
 			app:hintTextColor="@color/text_color_secondary_light">
 
 			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/message_field"
 				android:layout_width="match_parent"
-				android:background = "?attr/text_input_background"
 				android:layout_height="wrap_content"
 				android:imeOptions="actionDone" />
 
@@ -51,6 +51,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
 			android:hint="@string/gpx_tags_txt"
+			app:boxBackgroundColor="?attr/text_input_background"
 			app:boxStrokeColor="@color/osmand_orange"
 			app:helperText="@string/enter_text_separated"
 			app:helperTextEnabled="true"
@@ -62,7 +63,6 @@
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="@dimen/subHeaderPadding"
 				android:imeOptions="actionDone"
-				android:background = "?attr/text_input_background"
 				android:text="osmand" />
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -141,66 +141,13 @@
 	<View
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
+		android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
 		android:background="?attr/dashboard_divider" />
 
-	<LinearLayout
-		android:id="@+id/account_block"
+	<include layout="@layout/account_details" />
+
+	<View
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:minHeight="@dimen/context_menu_buttons_bottom_height"
-		tools:background="?android:attr/selectableItemBackground">
-
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@android:id/icon"
-			android:layout_width="@dimen/standard_icon_size"
-			android:layout_height="@dimen/standard_icon_size"
-			android:layout_gravity="center"
-			android:layout_marginStart="@dimen/content_padding"
-			android:layout_marginLeft="@dimen/content_padding"
-			android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
-			android:layout_marginEnd="@dimen/content_padding"
-			android:layout_marginRight="@dimen/bottom_sheet_icon_margin_large"
-			android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
-			android:tint="@color/active_buttons_and_links_text_disabled_light"
-			osmand:srcCompat="@drawable/ic_action_user_account" />
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:orientation="vertical"
-			android:paddingStart="@dimen/content_padding"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingEnd="@dimen/content_padding"
-			android:paddingRight="@dimen/content_padding">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/account_name"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ellipsize="marquee"
-				android:letterSpacing="@dimen/description_letter_spacing"
-				android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
-				android:singleLine="true"
-				android:text="@string/login_account"
-				android:textColor="?android:textColorSecondary"
-				android:textSize="@dimen/default_desc_text_size"
-				osmand:typeface="@string/font_roboto_regular" />
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/user_name"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
-				android:lineSpacingExtra="5dp"
-				android:maxLines="4"
-				android:textColor="?android:textColorPrimary"
-				android:textSize="@dimen/default_desc_text_size"
-				osmand:typeface="@string/font_roboto_regular" />
-
-		</LinearLayout>
-
-	</LinearLayout>
+		android:layout_height="@dimen/content_padding_small" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/send_osm_note_fragment.xml b/OsmAnd/res/layout/send_osm_note_fragment.xml
index 6cc897ee89..12205d77bb 100644
--- a/OsmAnd/res/layout/send_osm_note_fragment.xml
+++ b/OsmAnd/res/layout/send_osm_note_fragment.xml
@@ -1,169 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/content_padding"
-        android:paddingLeft="@dimen/content_padding"
-        android:paddingEnd="@dimen/content_padding"
-        android:paddingRight="@dimen/content_padding">
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding">
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/note_hint"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
-            android:hint="@string/osn_bug_name">
+		<com.google.android.material.textfield.TextInputLayout
+			android:id="@+id/note_hint"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
+			android:hint="@string/osn_bug_name"
+			app:boxBackgroundColor="?attr/text_input_background"
+			app:boxStrokeColor="@color/osmand_orange"
+			app:hintTextColor="@color/text_color_secondary_light">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/note_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:imeOptions="actionDone" />
-        </com.google.android.material.textfield.TextInputLayout>
+			<com.google.android.material.textfield.TextInputEditText
+				android:id="@+id/note_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:imeOptions="actionDone"
+				android:lineSpacingExtra="5sp" />
+		</com.google.android.material.textfield.TextInputLayout>
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/upload_anonymously_switch"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:minHeight="@dimen/context_menu_buttons_bottom_height"
-            android:layout_marginBottom="@dimen/content_padding_small"
-            android:paddingBottom="@dimen/content_padding_small"
-            android:paddingTop="@dimen/content_padding_small"
-            android:paddingLeft="@dimen/content_padding_small"
-            android:paddingRight="@dimen/content_padding_small"
-            android:text="@string/upload_anonymously"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/default_list_text_size"
-            android:letterSpacing="@dimen/text_button_letter_spacing"
-            osmand:typeface="@string/font_roboto_regular" />
+		<androidx.appcompat.widget.SwitchCompat
+			android:id="@+id/upload_anonymously_switch"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_marginBottom="@dimen/content_padding_small"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:minHeight="@dimen/context_menu_buttons_bottom_height"
+			android:paddingLeft="@dimen/content_padding_small"
+			android:paddingTop="@dimen/content_padding_small"
+			android:paddingRight="@dimen/content_padding_small"
+			android:paddingBottom="@dimen/content_padding_small"
+			android:text="@string/upload_anonymously"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-    </LinearLayout>
+	</LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/account_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/text_margin_small"
-        android:minHeight="@dimen/context_menu_buttons_bottom_height"
-        android:orientation="vertical">
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
+		android:background="?attr/dashboard_divider" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider" />
+	<include layout="@layout/account_details" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/content_padding_half"
-            android:minHeight="@dimen/context_menu_buttons_bottom_height">
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/content_padding_small" />
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@android:id/icon"
-                android:layout_width="@dimen/standard_icon_size"
-                android:layout_height="@dimen/standard_icon_size"
-                android:layout_gravity="center"
-                android:layout_marginLeft="@dimen/content_padding"
-                android:layout_marginRight="@dimen/content_padding"
-                osmand:srcCompat="@drawable/ic_action_user_account"
-                android:tint="@color/active_buttons_and_links_text_disabled_light"
-                android:layout_marginEnd="@dimen/content_padding"
-                android:layout_marginStart="@dimen/content_padding" />
+	<LinearLayout
+		android:id="@+id/sign_in_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minHeight="@dimen/context_menu_buttons_bottom_height"
+		android:orientation="vertical"
+		android:paddingTop="@dimen/text_margin_small">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:paddingStart="@dimen/content_padding"
-                android:paddingEnd="@dimen/content_padding">
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="?attr/dashboard_divider" />
 
-                <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/account_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:letterSpacing="@dimen/text_button_letter_spacing"
-                    android:singleLine="true"
-                    android:text="@string/login_account"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="@dimen/default_list_text_size"
-                    osmand:typeface="@string/font_roboto_regular" />
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/description"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/content_padding_small"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingBottom="@dimen/content_padding_small"
+			android:text="@string/osm_login_descr"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-                <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/user_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:letterSpacing="@dimen/description_letter_spacing"
-                    android:maxLines="4"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="@dimen/default_desc_text_size"
-                    osmand:typeface="@string/font_roboto_regular" />
+		<include
+			android:id="@+id/sign_in_button"
+			layout="@layout/bottom_sheet_dialog_button"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dialog_button_height"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginBottom="@dimen/content_padding_half" />
 
-            </LinearLayout>
+		<include
+			android:id="@+id/login_button"
+			layout="@layout/bottom_sheet_dialog_button"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dialog_button_height"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginTop="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginBottom="@dimen/content_padding" />
 
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/sign_in_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/text_margin_small"
-        android:minHeight="@dimen/context_menu_buttons_bottom_height"
-        android:orientation="vertical">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider" />
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
-            android:textColor="?android:textColorPrimary"
-            android:paddingTop="@dimen/content_padding_small"
-            android:paddingLeft="@dimen/content_padding"
-            android:paddingStart="@dimen/content_padding"
-            android:paddingRight="@dimen/content_padding"
-            android:paddingEnd="@dimen/content_padding"
-            android:paddingBottom="@dimen/content_padding_small"
-            android:textSize="@dimen/default_list_text_size"
-            osmand:typeface="@string/font_roboto_regular"
-            android:text="@string/osm_login_descr" />
-
-        <include
-            android:id="@+id/sign_in_button"
-            layout="@layout/bottom_sheet_dialog_button"
-            android:layout_marginBottom="@dimen/content_padding_half"
-            android:layout_marginLeft="@dimen/content_padding"
-            android:layout_marginRight="@dimen/content_padding"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dialog_button_height" />
-
-        <include
-            android:id="@+id/login_button"
-            layout="@layout/bottom_sheet_dialog_button"
-            android:layout_marginTop="@dimen/content_padding_small"
-            android:layout_marginBottom="@dimen/content_padding"
-            android:layout_marginLeft="@dimen/content_padding"
-            android:layout_marginRight="@dimen/content_padding"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dialog_button_height" />
-
-    </LinearLayout>
+	</LinearLayout>
 
 </LinearLayout>
+
diff --git a/OsmAnd/res/layout/send_poi_fragment.xml b/OsmAnd/res/layout/send_poi_fragment.xml
index 2f1ee7cf51..751c0b1fe8 100644
--- a/OsmAnd/res/layout/send_poi_fragment.xml
+++ b/OsmAnd/res/layout/send_poi_fragment.xml
@@ -1,123 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/content_padding"
-        android:paddingLeft="@dimen/content_padding"
-        android:paddingTop="@dimen/bottom_sheet_content_margin"
-        android:paddingEnd="@dimen/content_padding"
-        android:paddingRight="@dimen/content_padding">
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/bottom_sheet_content_margin"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding">
 
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/upload_poi"
-            android:textSize="@dimen/default_list_text_size"
-            osmand:typeface="@string/font_roboto_medium"
-            android:letterSpacing="@dimen/text_button_letter_spacing"/>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="16dp"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:text="@string/upload_poi"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
 
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/message_label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
-            android:hint="@string/shared_string_message">
+		<com.google.android.material.textfield.TextInputLayout
+			android:id="@+id/message_label"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
+			android:hint="@string/shared_string_message"
+			app:boxBackgroundColor="?attr/text_input_background"
+			app:boxStrokeColor="@color/osmand_orange"
+			app:hintTextColor="@color/text_color_secondary_light">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/message_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:imeOptions="actionDone" />
+                android:imeOptions="actionDone"
+				android:lineSpacingExtra="5sp"/>
         </com.google.android.material.textfield.TextInputLayout>
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/close_change_set_checkbox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding"
-            android:minHeight="@dimen/context_menu_buttons_bottom_height"
-            android:text="@string/close_changeset"
-            android:paddingLeft="@dimen/content_padding_small"
-            android:paddingRight="@dimen/content_padding_small"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/default_list_text_size"
-            osmand:typeface="@string/font_roboto_regular"
-            android:letterSpacing="@dimen/text_button_letter_spacing" />
+		<androidx.appcompat.widget.SwitchCompat
+			android:id="@+id/close_change_set_checkbox"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/content_padding"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:minHeight="@dimen/context_menu_buttons_bottom_height"
+			android:paddingLeft="@dimen/content_padding_small"
+			android:paddingRight="@dimen/content_padding_small"
+			android:text="@string/close_changeset"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-    </LinearLayout>
+	</LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/dashboard_divider" />
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
+		android:background="?attr/dashboard_divider" />
 
-    <LinearLayout
-        android:id="@+id/account_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/context_menu_buttons_bottom_height"
-        tools:background="?android:attr/selectableItemBackground">
+	<include layout="@layout/account_details" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@android:id/icon"
-            android:layout_width="@dimen/standard_icon_size"
-            android:layout_height="@dimen/standard_icon_size"
-            android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/content_padding"
-            android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
-            android:layout_marginRight="@dimen/bottom_sheet_icon_margin_large"
-            android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
-            osmand:srcCompat="@drawable/ic_action_user_account"
-            android:tint="@color/active_buttons_and_links_text_disabled_light"
-            android:layout_marginEnd="@dimen/content_padding"
-            android:layout_marginStart="@dimen/content_padding" />
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/content_padding_small" />
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:paddingLeft="@dimen/content_padding"
-            android:paddingRight="@dimen/content_padding"
-            android:paddingStart="@dimen/content_padding"
-            android:paddingEnd="@dimen/content_padding">
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/account_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:singleLine="true"
-                android:letterSpacing="@dimen/text_button_letter_spacing"
-                android:text="@string/login_account"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="@dimen/default_list_text_size"
-                osmand:typeface="@string/font_roboto_regular" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/user_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:letterSpacing="@dimen/description_letter_spacing"
-                android:maxLines="4"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="@dimen/default_desc_text_size"
-                osmand:typeface="@string/font_roboto_regular" />
-
-        </LinearLayout>
-
-    </LinearLayout>
 </LinearLayout>
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/BugBottomSheetDialog.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/BugBottomSheetDialog.java
index a865d0962c..3793196ce0 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/BugBottomSheetDialog.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/BugBottomSheetDialog.java
@@ -55,7 +55,7 @@ public class BugBottomSheetDialog extends MenuBottomSheetDialogFragment {
 		items.add(new TitleItem(getString(titleTextId)));
 
 		View osmNoteView = View.inflate(UiUtilities.getThemedContext(app, nightMode),
-				R.layout.track_name_edit_text, null);
+				R.layout.open_osm_note_text, null);
 		TextInputLayout textBox = osmNoteView.findViewById(R.id.name_text_box);
 		int highlightColorId = nightMode ? R.color.list_background_color_dark : R.color.activity_background_color_light;
 		textBox.setBoxBackgroundColorResource(highlightColorId);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java
index c488ad9149..628d693578 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java
@@ -7,6 +7,7 @@ import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -72,8 +73,9 @@ public class SendOsmNoteBottomSheetFragment extends MenuBottomSheetDialogFragmen
 		final View sendOsmNoteView = View.inflate(new ContextThemeWrapper(getContext(), themeRes),
 				R.layout.send_osm_note_fragment, null);
 
-		TextView noteText = sendOsmNoteView.findViewById(R.id.note_text);
+		EditText noteText = sendOsmNoteView.findViewById(R.id.note_text);
 		noteText.setText(((OsmNotesPoint) poi[0]).getText());
+		noteText.setSelection(noteText.getText().length());
 		TextInputLayout noteHint = sendOsmNoteView.findViewById(R.id.note_hint);
 		noteHint.setHint(AndroidUtils.addColon(app, R.string.osn_bug_name));
 		accountBlockView = sendOsmNoteView.findViewById(R.id.account_container);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java
index 676a1063ff..748d9504f0 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java
@@ -61,6 +61,7 @@ public class SendPoiBottomSheetFragment extends MenuBottomSheetDialogFragment {
         messageEditText = sendOsmPoiView.findViewById(R.id.message_field);
         String defaultChangeSet = createDefaultChangeSet(app);
         messageEditText.setText(defaultChangeSet);
+        messageEditText.setSelection(messageEditText.getText().length());
         final TextView accountName = sendOsmPoiView.findViewById(R.id.user_name);
         OsmandSettings settings = app.getSettings();
         String userNameOAuth = settings.USER_DISPLAY_NAME.get();
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
index 169d89b8cd..622fc11977 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
@@ -47,8 +47,6 @@ public class OsmLoginDataBottomSheet extends BasePreferenceBottomSheet {
 
 		userNameEditText = view.findViewById(R.id.name_edit_text);
 		passwordEditText = view.findViewById(R.id.password_edit_text);
-		userNameEditText.setBackgroundColor(getResolvedColor(R.color.background_field));
-		passwordEditText.setBackgroundColor(getResolvedColor(R.color.background_field));
 
 		String name = app.getSettings().USER_NAME.get();
 		String password = app.getSettings().USER_PASSWORD.get();
@@ -64,11 +62,6 @@ public class OsmLoginDataBottomSheet extends BasePreferenceBottomSheet {
 		TextInputLayout loginBox = view.findViewById(R.id.name_text_box);
 		TextInputLayout passwordBox = view.findViewById(R.id.password_text_box);
 
-		loginBox.setBoxStrokeColor(getResolvedColor(R.color.osmand_orange));
-		loginBox.setHintTextColor(AppCompatResources.getColorStateList(getContext(),R.color.hint_label));
-		passwordBox.setBoxStrokeColor(getResolvedColor(R.color.osmand_orange));
-		passwordBox.setHintTextColor(AppCompatResources.getColorStateList(getContext(),R.color.hint_label));
-
 		passwordBox.setStartIconDrawable(R.drawable.ic_action_lock);
 		loginBox.setStartIconDrawable(R.drawable.ic_action_user_account);
 		loginBox.setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);