diff --git a/OsmAnd/res/layout/parking_set_type.xml b/OsmAnd/res/layout/parking_set_type.xml
index fedc4ffc49..9768580ca4 100644
--- a/OsmAnd/res/layout/parking_set_type.xml
+++ b/OsmAnd/res/layout/parking_set_type.xml
@@ -1,55 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:paddingBottom="10dp"
+			  android:paddingTop="10dp"
+			  android:orientation="horizontal">
 
-    <TableRow
-        android:id="@+id/tableRow1"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+	<LinearLayout
+			android:id="@+id/tableRow1"
+			android:orientation="vertical"
+			android:layout_width="0dp"
+			android:layout_weight="1"
+			android:layout_height="wrap_content">
 
-        <ImageButton
-            android:id="@+id/parking_no_lim_button"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="32dp"
-            android:gravity="center_horizontal"
-            android:background="@drawable/poi_parking_pos_no_limit_menu"
-            android:contentDescription="@string/osmand_parking_time_no_limit" />
+		<ImageButton android:layout_height="wrap_content"
+					 android:layout_width="wrap_content"
+					 android:layout_gravity="center_horizontal"
+					 android:id="@+id/parking_no_lim_button"
+					 android:gravity="center_horizontal"
+					 android:background="@drawable/poi_parking_pos_no_limit_menu"
+					 android:contentDescription="@string/osmand_parking_time_no_limit"/>
 
-        <ImageButton
-            android:id="@+id/parking_lim_button"
-            android:layout_column="1"
-            android:layout_marginRight="16dp"
-            android:layout_marginLeft="32dp"
-            android:gravity="center_horizontal"
-            android:background="@drawable/poi_parking_pos_limit_menu"
-            android:contentDescription="@string/osmand_parking_time_limit" />
+		<TextView android:layout_height="wrap_content"
+				  android:layout_width="wrap_content"
+				  android:layout_gravity="center_horizontal"
+				  android:id="@+id/parking_lim_text"
+				  android:gravity="center_horizontal"
+				  android:text="@string/osmand_parking_no_lim_text"/>
+	</LinearLayout>
 
-    </TableRow>
+	<LinearLayout android:id="@+id/tableRow2"
+				  android:orientation="vertical"
+				  android:layout_weight="1"
+				  android:layout_width="0dp"
+				  android:layout_height="wrap_content">
 
-    <TableRow
-        android:id="@+id/tableRow2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+		<ImageButton android:layout_height="wrap_content"
+					 android:layout_width="wrap_content"
+					 android:id="@+id/parking_lim_button"
+					 android:layout_gravity="center_horizontal"
+					 android:gravity="center_horizontal"
+					 android:background="@drawable/poi_parking_pos_limit_menu"
+					 android:contentDescription="@string/osmand_parking_time_limit"/>
 
-        <TextView
-            android:id="@+id/parking_lim_text"
-            android:layout_column="0"
-            android:layout_marginRight="4dp"
-            android:layout_marginLeft="4dp"
-            android:gravity="center_horizontal"
-            android:maxWidth="10dp"
-            android:text="@string/osmand_parking_no_lim_text" />
+		<TextView android:layout_height="wrap_content"
+				  android:layout_width="wrap_content"
+				  android:id="@+id/parking_no_lim_text"
+				  android:layout_gravity="center_horizontal"
+				  android:gravity="center_horizontal"
+				  android:text="@string/osmand_parking_lim_text"/>
+	</LinearLayout>
+
+</LinearLayout>
 
-        <TextView
-            android:id="@+id/parking_no_lim_text"
-            android:layout_column="1"
-            android:layout_marginRight="4dp"
-            android:layout_marginLeft="4dp"
-            android:gravity="center_horizontal"
-            android:maxWidth="10dp"
-            android:text="@string/osmand_parking_lim_text" />
-    </TableRow>
 
-</TableLayout>
\ No newline at end of file