diff --git a/OsmAnd/res/layout/list_item_bidforfix.xml b/OsmAnd/res/layout/list_item_bidforfix.xml
index c4a362a06a..bdde2dbc7e 100644
--- a/OsmAnd/res/layout/list_item_bidforfix.xml
+++ b/OsmAnd/res/layout/list_item_bidforfix.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/bidforfixitemlayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
     android:background="@android:color/white" >
 
     <TextView
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 6af9936f41..e384c4a202 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/plugin_name"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="10dp"
         android:textStyle="bold"
diff --git a/OsmAnd/res/layout/titlebar.xml b/OsmAnd/res/layout/titlebar.xml
index a6c6429801..88750e2b7b 100644
--- a/OsmAnd/res/layout/titlebar.xml
+++ b/OsmAnd/res/layout/titlebar.xml
@@ -32,7 +32,7 @@
     <net.osmand.plus.activities.FontFitTextView
         android:id="@+id/title_text"
         style="@style/WhiteTitleText"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_centerVertical="true"
diff --git a/OsmAnd/res/layout/titlebar_extrabutton.xml b/OsmAnd/res/layout/titlebar_extrabutton.xml
index 8c08a6cd6c..cabcb12811 100644
--- a/OsmAnd/res/layout/titlebar_extrabutton.xml
+++ b/OsmAnd/res/layout/titlebar_extrabutton.xml
@@ -19,7 +19,7 @@
     <net.osmand.plus.activities.FontFitTextView
         android:id="@+id/title_text"
         style="@style/WhiteTitleText"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_centerVertical="true"