diff --git a/OsmAnd/res/layout/grid_menu_item.xml b/OsmAnd/res/layout/grid_menu_item.xml
index db4cd1a2df..206d2a025b 100644
--- a/OsmAnd/res/layout/grid_menu_item.xml
+++ b/OsmAnd/res/layout/grid_menu_item.xml
@@ -1,36 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/grid_menu_item_width"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
-    android:paddingRight="@dimen/bottom_sheet_content_padding_small"
-    tools:background="#17171A"
-    tools:layout_gravity="center">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackgroundBorderless"
+	android:orientation="vertical"
+	android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
+	android:paddingRight="@dimen/bottom_sheet_content_padding_small"
+	tools:background="#17171A"
+	tools:layout_gravity="center">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/grid_menu_item_bottom_top_margin"
-        android:layout_marginLeft="@dimen/grid_menu_item_sides_margin"
-        android:layout_marginRight="@dimen/grid_menu_item_sides_margin"
-        android:layout_marginTop="@dimen/grid_menu_item_bottom_top_margin"
-        tools:src="@drawable/ic_action_delete_dark"
-        tools:tint="#808080"/>
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal"
+		android:layout_marginBottom="@dimen/grid_menu_item_bottom_top_margin"
+		android:layout_marginTop="@dimen/grid_menu_item_bottom_top_margin"
+		tools:src="@drawable/ic_action_delete_dark"
+		tools:tint="#808080"/>
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:gravity="center_horizontal"
-        android:lines="2"
-        android:maxLines="2"
-        android:textColor="@color/searchbar_text_hint_light"
-        tools:text="Remove POI"/>
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:ellipsize="end"
+		android:gravity="center_horizontal"
+		android:lines="2"
+		android:maxLines="2"
+		android:textColor="@color/searchbar_text_hint_light"
+		tools:text="Remove POI"/>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/grid_menu_row.xml b/OsmAnd/res/layout/grid_menu_row.xml
index dbfcdd1d89..3f1b8df883 100644
--- a/OsmAnd/res/layout/grid_menu_row.xml
+++ b/OsmAnd/res/layout/grid_menu_row.xml
@@ -1,33 +1,46 @@
 <?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"
-    android:paddingTop="@dimen/bottom_sheet_content_padding_small">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingTop="@dimen/bottom_sheet_content_padding_small">
 
-    <FrameLayout
-        android:id="@+id/first_item_container"
-        android:layout_width="@dimen/grid_menu_item_width"
-        android:layout_height="wrap_content"/>
+	<Space
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="0.25"/>
 
-    <Space
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
+	<FrameLayout
+		android:id="@+id/first_item_container"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="3"/>
 
-    <FrameLayout
-        android:id="@+id/second_item_container"
-        android:layout_width="@dimen/grid_menu_item_width"
-        android:layout_height="wrap_content"/>
+	<Space
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="0.5"/>
 
-    <Space
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
+	<FrameLayout
+		android:id="@+id/second_item_container"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="3"/>
 
-    <FrameLayout
-        android:id="@+id/third_item_container"
-        android:layout_width="@dimen/grid_menu_item_width"
-        android:layout_height="wrap_content"/>
+	<Space
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="0.5"/>
+
+	<FrameLayout
+		android:id="@+id/third_item_container"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="3"/>
+
+	<Space
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="0.25"/>
 
 </LinearLayout>