diff --git a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml
index b3d6f99388..ed3f0e5956 100644
--- a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml
+++ b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml
@@ -4,7 +4,7 @@
     <item android:drawable="@color/map_background_color_light"/>
     <item android:top="@dimen/splash_screen_logo_top">
         <bitmap
-            android:gravity="center_horizontal|top"
+            android:gravity="center"
             android:src="@drawable/ic_logo_splash_osmand"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free_dev.xml b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free_dev.xml
index b3d6f99388..ed3f0e5956 100644
--- a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free_dev.xml
+++ b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free_dev.xml
@@ -4,7 +4,7 @@
     <item android:drawable="@color/map_background_color_light"/>
     <item android:top="@dimen/splash_screen_logo_top">
         <bitmap
-            android:gravity="center_horizontal|top"
+            android:gravity="center"
             android:src="@drawable/ic_logo_splash_osmand"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_plus.xml b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_plus.xml
index 1dc65ed611..4c95aa687e 100644
--- a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_plus.xml
+++ b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_plus.xml
@@ -4,7 +4,7 @@
     <item android:drawable="@color/map_background_color_light"/>
     <item android:top="@dimen/splash_screen_logo_top">
         <bitmap
-            android:gravity="center_horizontal|top"
+            android:gravity="center"
             android:src="@drawable/ic_logo_splash_osmand_plus"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_subcategories.xml b/OsmAnd/res/layout/fragment_subcategories.xml
index 26b3f33ef4..aa3b449c0c 100644
--- a/OsmAnd/res/layout/fragment_subcategories.xml
+++ b/OsmAnd/res/layout/fragment_subcategories.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/actionModeBackground"
-            android:minHeight="@dimen/dashboard_map_toolbar"
+            android:minHeight="@dimen/toolbar_height"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="54dp"
             app:contentInsetStart="54dp">
diff --git a/OsmAnd/res/layout/mode_view.xml b/OsmAnd/res/layout/mode_view.xml
index f21a90246e..689d3db45a 100644
--- a/OsmAnd/res/layout/mode_view.xml
+++ b/OsmAnd/res/layout/mode_view.xml
@@ -6,8 +6,8 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/app_mode_icon"
-        android:layout_width="@dimen/map_widget_icon"
-        android:layout_height="@dimen/map_widget_icon"
+        android:layout_width="@dimen/standard_icon_size"
+        android:layout_height="@dimen/standard_icon_size"
         android:layout_gravity="center"
         tools:src="@drawable/ic_dashboard_dark"
         android:background="?attr/dashboard_button" />
diff --git a/OsmAnd/res/layout/mode_view_route_preparation.xml b/OsmAnd/res/layout/mode_view_route_preparation.xml
index 14ca12a135..9b5883b264 100644
--- a/OsmAnd/res/layout/mode_view_route_preparation.xml
+++ b/OsmAnd/res/layout/mode_view_route_preparation.xml
@@ -6,8 +6,8 @@
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/app_mode_icon"
-        android:layout_width="@dimen/map_widget_icon"
-        android:layout_height="@dimen/map_widget_icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
 		android:layout_gravity="center"
 		tools:src="@drawable/ic_dashboard_dark" />
 
diff --git a/OsmAnd/res/layout/search_custom_poi.xml b/OsmAnd/res/layout/search_custom_poi.xml
index 111fa6c3d5..7023b905ce 100644
--- a/OsmAnd/res/layout/search_custom_poi.xml
+++ b/OsmAnd/res/layout/search_custom_poi.xml
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/osmand_orange"
-            android:minHeight="@dimen/dashboard_map_toolbar"
+            android:minHeight="@dimen/toolbar_height"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="54dp"
             app:contentInsetStart="54dp"
diff --git a/OsmAnd/res/values-land/sizes.xml b/OsmAnd/res/values-land/sizes.xml
index a927d1e718..3dac1a225d 100644
--- a/OsmAnd/res/values-land/sizes.xml
+++ b/OsmAnd/res/values-land/sizes.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="map_go_button_width">200dp</dimen>
-
-    <dimen name="splash_screen_logo_top">12dp</dimen>
+    <dimen name="splash_screen_logo_top">22dp</dimen>
     <dimen name="splash_screen_text_bottom">12dp</dimen>
     <dimen name="splash_screen_osm_text_bottom">12dp</dimen>
 
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 00e5606654..2773ca50f3 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -69,7 +69,6 @@
 	<dimen name="context_menu_main_actions_padding_top">11dp</dimen>
 	<dimen name="context_menu_main_actions_padding_bottom">9dp</dimen>
 	<dimen name="context_menu_main_actions_icon_margin">5dp</dimen>
-	<dimen name="context_menu_big_icon_size">54dp</dimen>
 
 	<dimen name="fab_size_with_shadow">90dp</dimen>
 	<dimen name="fab_margin_right">18dp</dimen>
@@ -101,12 +100,9 @@
 	<dimen name="route_info_button_go_drawable_padding">21dp</dimen>
 	<dimen name="route_info_directions_margin">72dp</dimen>
 	<dimen name="route_info_icon_padding_left">18dp</dimen>
-	<dimen name="route_info_modes_height">72dp</dimen>
 	<dimen name="route_info_details_padding">18dp</dimen>
 	<dimen name="route_info_settings_buttons_height">48dp</dimen>
 	<dimen name="route_info_app_modes_padding">60dp</dimen>
-	<dimen name="route_info_card_row_min_height">90dp</dimen>
-	<dimen name="route_info_card_item_height">84dp</dimen>
 	<dimen name="route_info_list_text_padding">78dp</dimen>
 	<dimen name="route_info_warning_padding">27dp</dimen>
 	<dimen name="route_info_button_bg_line_radius">27dp</dimen>
diff --git a/OsmAnd/res/values-sw600dp-land/sizes.xml b/OsmAnd/res/values-sw600dp-land/sizes.xml
index fcb6e1f8c5..90baa4ed8e 100644
--- a/OsmAnd/res/values-sw600dp-land/sizes.xml
+++ b/OsmAnd/res/values-sw600dp-land/sizes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="splash_screen_logo_top">120dp</dimen>
+    <dimen name="splash_screen_logo_top">-48dp</dimen>
     <dimen name="splash_screen_text_bottom">12dp</dimen>
     <dimen name="splash_screen_osm_text_bottom">24dp</dimen>
 
diff --git a/OsmAnd/res/values-sw600dp/sizes.xml b/OsmAnd/res/values-sw600dp/sizes.xml
index cd419b6f73..8008a2e0d0 100644
--- a/OsmAnd/res/values-sw600dp/sizes.xml
+++ b/OsmAnd/res/values-sw600dp/sizes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="splash_screen_logo_top">240dp</dimen>
+    <dimen name="splash_screen_logo_top">-48dp</dimen>
     <dimen name="splash_screen_text_bottom">36dp</dimen>
     <dimen name="splash_screen_osm_text_bottom">24dp</dimen>
 
diff --git a/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java b/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
index 9853e77390..147c4b80cc 100644
--- a/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
+++ b/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.fragment.app.FragmentActivity;
@@ -36,15 +37,6 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 		return (MapActivity) getActivity();
 	}
 
-	private boolean hasNavBar() {
-		int id = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
-		if (id > 0) {
-			return getResources().getBoolean(id);
-		} else {
-			return false;
-		}
-	}
-
 	private int getStatusBarHeight() {
 		int statusBarHeight = 0;
 		int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
@@ -55,7 +47,7 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 	}
 
 	private int getNavigationBarHeight() {
-		if (!hasNavBar())
+		if (!AndroidUtils.hasNavBar(getContext()) && !AndroidUtils.isNavBarVisible(getMapActivity()))
 			return 0;
 		int orientation = getResources().getConfiguration().orientation;
 		if (isSmartphone() && Configuration.ORIENTATION_LANDSCAPE == orientation)
@@ -67,7 +59,7 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 	}
 
 	private int getNavigationBarWidth() {
-		if (!hasNavBar())
+		if (!AndroidUtils.hasNavBar(getContext()) && !AndroidUtils.isNavBarVisible(getMapActivity()))
 			return 0;
 		int orientation = getResources().getConfiguration().orientation;
 		if (orientation == Configuration.ORIENTATION_LANDSCAPE && isSmartphone()) {
@@ -80,7 +72,7 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 
 	@Nullable
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		OsmandApplication app = requireMyApplication();
 		FragmentActivity activity = requireActivity();
 
@@ -130,11 +122,11 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 		RelativeLayout.LayoutParams osmTextLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
 		osmTextLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
 		osmTextLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
-		
-		int defaultLogoMarginTop = (int) getResources().getDimension(R.dimen.splash_screen_logo_top);
+
+		int defaultLogoMarginTop = getResources().getDimensionPixelSize(R.dimen.splash_screen_logo_top);
 		int logoMarginTop = defaultLogoMarginTop - (Build.VERSION.SDK_INT >= 21 ? 0 : getStatusBarHeight());
-		int textMarginBottom = (int) getResources().getDimension(R.dimen.splash_screen_text_bottom);
-		int osmTextMarginBottom = (int) getResources().getDimension(R.dimen.splash_screen_osm_text_bottom);
+		int textMarginBottom = getResources().getDimensionPixelSize(R.dimen.splash_screen_text_bottom);
+		int osmTextMarginBottom = getResources().getDimensionPixelSize(R.dimen.splash_screen_osm_text_bottom);
 		int elementsPaddingLeft = 0;
 		int elementsPaddingRight = 0;
 		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 7c8d5b6553..31ef529274 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -1314,7 +1314,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 			final ImageView iconView = (ImageView) view.findViewById(R.id.context_menu_icon_view);
 			Drawable icon = menu.getRightIcon();
 			int iconId = menu.getRightIconId();
-			int sizeId = menu.isBigRightIcon() ? R.dimen.context_menu_big_icon_size : R.dimen.map_widget_icon;
+			int sizeId = menu.isBigRightIcon() ? R.dimen.context_menu_big_icon_size : R.dimen.standard_icon_size;
 			if (menu.getPointDescription().isFavorite() || menu.getPointDescription().isWpt()) {
 				sizeId = R.dimen.favorites_icon_size;
 			}