diff --git a/OsmAnd/res/layout/global_preference_toolbar.xml b/OsmAnd/res/layout/global_preference_toolbar.xml
index 44b75ad95f..9419eed5f0 100644
--- a/OsmAnd/res/layout/global_preference_toolbar.xml
+++ b/OsmAnd/res/layout/global_preference_toolbar.xml
@@ -5,6 +5,7 @@
 	android:id="@+id/toolbar"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:minHeight="@dimen/toolbar_height"
 	android:background="?attr/actionModeBackground"
 	android:padding="0dp"
 	app:contentInsetLeft="0dp"
diff --git a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
index 8d062117ae..ba39eb6412 100644
--- a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
@@ -6,6 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/actionModeBackground"
+	android:minHeight="@dimen/toolbar_height"
 	app:contentInsetLeft="0dp"
 	app:contentInsetStart="0dp"
 	app:contentInsetRight="0dp"
diff --git a/OsmAnd/res/layout/profile_preference_toolbar.xml b/OsmAnd/res/layout/profile_preference_toolbar.xml
index 3b38185038..2c013b3f00 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar.xml
@@ -4,6 +4,7 @@
 	android:id="@+id/toolbar"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:minHeight="@dimen/toolbar_height"
 	osmand:contentInsetLeft="0dp"
 	osmand:contentInsetStart="0dp"
 	osmand:contentInsetRight="0dp"
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml b/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml
index d8b1dafaaa..98f2b0966d 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml
@@ -6,6 +6,7 @@
     android:layout_height="wrap_content"
     android:background="?attr/actionModeBackground"
     android:minHeight="@dimen/toolbar_height"
+    android:padding="0dp"
     osmand:contentInsetLeft="0dp"
     osmand:contentInsetStart="0dp"
     osmand:contentInsetRight="0dp"
diff --git a/OsmAnd/res/layout/search_advanced_coords.xml b/OsmAnd/res/layout/search_advanced_coords.xml
index 04f7aaa16e..75b3ee5b4e 100644
--- a/OsmAnd/res/layout/search_advanced_coords.xml
+++ b/OsmAnd/res/layout/search_advanced_coords.xml
@@ -1,10 +1,11 @@
 <?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:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -17,8 +18,10 @@
             android:background="@color/osmand_orange"
             android:minHeight="@dimen/dashboard_map_toolbar"
             android:theme="?attr/toolbar_theme"
-            app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp"
+            android:padding="0dp"
+            app:contentInsetStartWithNavigation="@dimen/toolbar_inset_start_with_navigation"
+            app:contentInsetLeft="0dp"
+            app:contentInsetStart="0dp"
             app:contentInsetRight="0dp"
             app:contentInsetEnd="0dp">
 
@@ -28,10 +31,11 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <TextView
+                <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/titleEdit"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:letterSpacing="@dimen/text_button_letter_spacing"
                     android:layout_weight="1"
                     android:background="@null"
                     android:ellipsize="end"
@@ -40,7 +44,8 @@
                     android:singleLine="true"
                     android:text="@string/coords_search"
                     android:textColor="@color/color_white"
-                    android:textSize="@dimen/default_list_text_size_large"/>
+                    osmand:typeface="@string/font_roboto_medium"
+                    android:textSize="@dimen/dialog_header_text_size"/>
 
                 <ProgressBar
                     android:id="@+id/searchProgressBar"
@@ -50,8 +55,8 @@
                     android:layout_marginLeft="8dp"
                     android:indeterminate="true"
                     android:visibility="gone"
-	                android:layout_marginStart="8dp"
-	                android:layout_marginEnd="8dp" />
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp" />
 
             </LinearLayout>
 
diff --git a/OsmAnd/res/layout/search_custom_poi.xml b/OsmAnd/res/layout/search_custom_poi.xml
index 7023b905ce..23234ebc92 100644
--- a/OsmAnd/res/layout/search_custom_poi.xml
+++ b/OsmAnd/res/layout/search_custom_poi.xml
@@ -9,7 +9,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="@dimen/toolbar_height">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -18,8 +18,10 @@
             android:background="@color/osmand_orange"
             android:minHeight="@dimen/toolbar_height"
             android:theme="?attr/toolbar_theme"
-            app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp"
+            android:padding="0dp"
+            app:contentInsetStartWithNavigation="@dimen/toolbar_inset_start_with_navigation"
+            app:contentInsetLeft="0dp"
+            app:contentInsetStart="0dp"
             app:contentInsetRight="0dp"
             app:contentInsetEnd="0dp">
 
@@ -31,15 +33,14 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="14dp"
-                    android:layout_marginTop="14dp"
                     android:layout_weight="1"
                     android:orientation="vertical">
 
-                    <TextView
+                    <net.osmand.plus.widgets.TextViewEx
                         android:id="@+id/title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:letterSpacing="@dimen/text_button_letter_spacing"
                         android:background="@null"
                         android:ellipsize="end"
                         android:lines="1"
@@ -47,7 +48,8 @@
                         android:singleLine="true"
                         android:text="@string/create_custom_poi"
                         android:textColor="@color/color_white"
-                        android:textSize="@dimen/default_list_text_size_large"/>
+                        osmand:typeface="@string/font_roboto_medium"
+                        android:textSize="@dimen/dialog_header_text_size"/>
 
                 </LinearLayout>
 
diff --git a/OsmAnd/res/layout/search_dialog_fragment.xml b/OsmAnd/res/layout/search_dialog_fragment.xml
index 964a025182..3b8e813f83 100644
--- a/OsmAnd/res/layout/search_dialog_fragment.xml
+++ b/OsmAnd/res/layout/search_dialog_fragment.xml
@@ -24,8 +24,9 @@
                 android:minHeight="@dimen/dashboard_map_toolbar"
                 android:padding="0dp"
                 android:theme="?attr/toolbar_theme"
-                app:contentInsetLeft="54dp"
-                app:contentInsetStart="54dp"
+                app:contentInsetStartWithNavigation="@dimen/toolbar_inset_start_with_navigation"
+                app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
                 app:contentInsetRight="0dp"
                 app:contentInsetEnd="0dp">
 
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 70b9e5eb7e..07047222d2 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -121,7 +121,6 @@
 	<dimen name="bottom_sheet_menu_peek_height">450dp</dimen>
 	<dimen name="side_of_the_world_button_size">54dp</dimen>
 
-	<dimen name="toolbar_height">64dp</dimen>
 	<dimen name="poi_icon_size">24dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index cd33774ac5..8f6a9e92ab 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -9,7 +9,7 @@
 	<dimen name="wpt_list_category_height">60dp</dimen>
 	<dimen name="wpt_list_item_height">56dp</dimen>
 	<dimen name="list_item_button_padding">4dp</dimen>
-	<dimen name="action_bar_height">64dp</dimen>
+	<dimen name="action_bar_height">56dp</dimen>
 	<dimen name="list_content_padding_large">32dp</dimen>
 	<dimen name="title_padding">20dp</dimen>
     <dimen name="title_text_size">28sp</dimen>
@@ -335,6 +335,7 @@
 
 	<dimen name="toolbar_height">56dp</dimen>
 	<dimen name="toolbar_height_expanded">96dp</dimen>
+	<dimen name="toolbar_inset_start_with_navigation">72dp</dimen>
 
 	<dimen name="wikivoyage_search_list_header_height">36dp</dimen>
 	<dimen name="wikivoyage_article_card_icon_size">80dp</dimen>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 468bdfe57d..9213c31d88 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -287,6 +287,7 @@
         <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
         <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_light</item>
         <item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_light</item>
+        <item name="actionBarSize">@dimen/action_bar_height</item>
     </style>
 
     <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@@ -556,6 +557,7 @@
         <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
         <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_dark</item>
         <item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_dark</item>
+        <item name="actionBarSize">@dimen/action_bar_height</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">