diff --git a/OsmAnd/res/layout/global_preference_toolbar.xml b/OsmAnd/res/layout/global_preference_toolbar.xml
index dd754224b4..bd31e3240b 100644
--- a/OsmAnd/res/layout/global_preference_toolbar.xml
+++ b/OsmAnd/res/layout/global_preference_toolbar.xml
@@ -21,14 +21,9 @@
 		<ImageButton
 			android:id="@+id/close_button"
 			style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
-			android:layout_width="@dimen/standard_icon_size"
-			android:layout_height="@dimen/standard_icon_size"
-			android:layout_marginLeft="@dimen/content_padding"
-			android:layout_marginStart="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
-			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_width="@dimen/toolbar_height"
+			android:layout_height="@dimen/toolbar_height"
 			android:contentDescription="@string/access_shared_string_navigate_up"
-			android:scaleType="fitCenter"
 			app:srcCompat="@drawable/ic_arrow_back" />
 
 		<LinearLayout
diff --git a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
index 98ab7978d1..8d062117ae 100644
--- a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
@@ -27,14 +27,9 @@
 			<ImageButton
 				android:id="@+id/close_button"
 				style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
-				android:layout_width="@dimen/standard_icon_size"
-				android:layout_height="@dimen/standard_icon_size"
-				android:layout_marginLeft="@dimen/content_padding"
-				android:layout_marginStart="@dimen/content_padding"
-				android:layout_marginRight="@dimen/content_padding"
-				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_width="@dimen/toolbar_height"
+				android:layout_height="@dimen/toolbar_height"
 				android:contentDescription="@string/access_shared_string_navigate_up"
-				android:scaleType="fitCenter"
 				app:srcCompat="@drawable/ic_arrow_back" />
 
 			<net.osmand.plus.widgets.TextViewEx
diff --git a/OsmAnd/res/layout/point_editor_fragment_new.xml b/OsmAnd/res/layout/point_editor_fragment_new.xml
index 53b1578816..0b2ca56e50 100644
--- a/OsmAnd/res/layout/point_editor_fragment_new.xml
+++ b/OsmAnd/res/layout/point_editor_fragment_new.xml
@@ -18,27 +18,26 @@
 
 		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
-			android:layout_width="fill_parent"
+			android:layout_width="match_parent"
 			android:layout_height="@dimen/toolbar_height"
 			android:background="?attr/card_and_list_background_basic"
-			android:paddingRight="@dimen/content_padding"
-			android:paddingEnd="@dimen/content_padding"
 			android:minHeight="@dimen/toolbar_height"
 			osmand:subtitleTextColor="?android:textColorPrimary"
 			osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar"
 			osmand:titleTextColor="?android:textColorPrimary">
 
-			<androidx.appcompat.widget.AppCompatImageView
+			<ImageButton
 				android:id="@+id/toolbar_action"
-				android:layout_width="@dimen/standard_icon_size"
-				android:layout_height="match_parent"
+				style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+				android:layout_width="@dimen/acceptable_touch_radius"
+				android:layout_height="@dimen/acceptable_touch_radius"
 				android:layout_gravity="end"
-				android:contentDescription="@string/replace_all"
-				app:srcCompat="@drawable/ic_action_replace"
-				android:layout_marginRight="@dimen/content_padding_half"
-				android:layout_marginStart="@dimen/content_padding_half"
-				android:layout_marginLeft="@dimen/content_padding"
-				android:layout_marginEnd="@dimen/content_padding" />
+				android:layout_marginStart="@dimen/list_item_button_padding"
+				android:layout_marginLeft="@dimen/list_item_button_padding"
+				android:layout_marginEnd="@dimen/list_item_button_padding"
+				android:layout_marginRight="@dimen/list_item_button_padding"
+				android:contentDescription="@string/access_shared_string_navigate_up"
+				app:srcCompat="@drawable/ic_action_replace" />
 
 		</androidx.appcompat.widget.Toolbar>
 
diff --git a/OsmAnd/res/layout/profile_preference_toolbar.xml b/OsmAnd/res/layout/profile_preference_toolbar.xml
index d2260f21ea..3b38185038 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar.xml
@@ -21,14 +21,9 @@
 		<ImageButton
 			android:id="@+id/close_button"
 			style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
-			android:layout_width="@dimen/standard_icon_size"
-			android:layout_height="@dimen/standard_icon_size"
-			android:layout_marginLeft="@dimen/content_padding"
-			android:layout_marginStart="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
-			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_width="@dimen/toolbar_height"
+			android:layout_height="@dimen/toolbar_height"
 			android:contentDescription="@string/access_shared_string_navigate_up"
-			android:scaleType="fitCenter"
 			osmand:srcCompat="@drawable/ic_arrow_back"
 			android:tint="?attr/default_icon_color" />
 
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
index 502dfde3ca..d34c987376 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
@@ -27,14 +27,9 @@
 			<ImageButton
 				android:id="@+id/close_button"
 				style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
-				android:layout_width="@dimen/standard_icon_size"
-				android:layout_height="@dimen/standard_icon_size"
-				android:layout_marginLeft="@dimen/content_padding"
-				android:layout_marginStart="@dimen/content_padding"
-				android:layout_marginRight="@dimen/content_padding"
-				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_width="@dimen/toolbar_height"
+				android:layout_height="@dimen/toolbar_height"
 				android:contentDescription="@string/access_shared_string_navigate_up"
-				android:scaleType="fitCenter"
 				osmand:srcCompat="@drawable/ic_arrow_back"
 				android:tint="?attr/default_icon_color" />