diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index e1386906b5..ebbcee4ea5 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -60,7 +60,6 @@
 
 	<ExpandableListView
 		android:id="@android:id/list"
-		style="@style/OsmandListView"
 		android:layout_width="fill_parent"
 		android:layout_height="0dp"
 		android:layout_marginLeft="0dp"
diff --git a/OsmAnd/res/layout/download_index.xml b/OsmAnd/res/layout/download_index.xml
index 0e0cd8badc..6e1c778534 100644
--- a/OsmAnd/res/layout/download_index.xml
+++ b/OsmAnd/res/layout/download_index.xml
@@ -19,7 +19,6 @@
 
     <ExpandableListView
         android:id="@android:id/list"
-        style="@style/OsmandListView"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
         android:layout_marginLeft="0dp"
diff --git a/OsmAnd/res/layout/editing_poi_filter.xml b/OsmAnd/res/layout/editing_poi_filter.xml
index b41ed9c97b..a7bd5b8971 100644
--- a/OsmAnd/res/layout/editing_poi_filter.xml
+++ b/OsmAnd/res/layout/editing_poi_filter.xml
@@ -7,7 +7,6 @@
 
     <ListView
         android:id="@android:id/list"
-        style="@style/OsmandListView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
 		android:choiceMode="multipleChoice" />
diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index 9ca9c8d0af..c025d83946 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -48,7 +48,6 @@
 
 	<ExpandableListView
 		android:id="@android:id/list"
-		style="@style/OsmandListView"
 		android:layout_width="fill_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1"
diff --git a/OsmAnd/res/layout/osmo_group_list.xml b/OsmAnd/res/layout/osmo_group_list.xml
index c4fdb8c57e..cc0fb62419 100644
--- a/OsmAnd/res/layout/osmo_group_list.xml
+++ b/OsmAnd/res/layout/osmo_group_list.xml
@@ -17,7 +17,6 @@
 
 	<ExpandableListView
 			android:id="@android:id/list"
-			style="@style/OsmandListView"
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
 			android:layout_marginLeft="0dp"
diff --git a/OsmAnd/res/layout/osmo_groups_list.xml b/OsmAnd/res/layout/osmo_groups_list.xml
index d176236cb2..5c287128db 100644
--- a/OsmAnd/res/layout/osmo_groups_list.xml
+++ b/OsmAnd/res/layout/osmo_groups_list.xml
@@ -14,7 +14,6 @@
         android:layout_marginRight="0dp"
         android:layout_marginTop="0dp"
         android:layout_weight="1"
-        android:groupIndicator="@android:color/transparent"
-        style="@style/OsmandListView" />
+        android:groupIndicator="@android:color/transparent"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plan_route_settings.xml b/OsmAnd/res/layout/plan_route_settings.xml
index 7a8bcaa2cc..8fdebe15a8 100644
--- a/OsmAnd/res/layout/plan_route_settings.xml
+++ b/OsmAnd/res/layout/plan_route_settings.xml
@@ -7,6 +7,7 @@
     <LinearLayout
         android:id="@+id/TopBar"
         android:layout_width="fill_parent"
+        android:orientation="horizontal"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal" />
 
@@ -34,7 +35,6 @@
 
     <ListView
         android:id="@android:id/list"
-        style="@style/OsmandListView"
         android:layout_marginTop="5dp"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"></ListView>
diff --git a/OsmAnd/res/layout/route_steps_main.xml b/OsmAnd/res/layout/route_steps_main.xml
index 6a9094be2b..91adc88a0d 100644
--- a/OsmAnd/res/layout/route_steps_main.xml
+++ b/OsmAnd/res/layout/route_steps_main.xml
@@ -32,8 +32,7 @@
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:choiceMode="singleChoice"
-        style="@style/OsmandListView" />
+        android:choiceMode="singleChoice"/>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_activity_single.xml b/OsmAnd/res/layout/search_activity_single.xml
index 3b86307ca6..94896b49da 100644
--- a/OsmAnd/res/layout/search_activity_single.xml
+++ b/OsmAnd/res/layout/search_activity_single.xml
@@ -16,5 +16,5 @@
 			android:orientation="horizontal"
 			android:id="@+id/bottomControls"
 			android:layout_width="fill_parent"
-			android:layout_height="@dimen/bottom_tool_bar_size"/>
+			android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_address_offline.xml b/OsmAnd/res/layout/search_address_offline.xml
index 04697204fa..0b9d71505b 100644
--- a/OsmAnd/res/layout/search_address_offline.xml
+++ b/OsmAnd/res/layout/search_address_offline.xml
@@ -6,7 +6,6 @@
 
     <ListView
         android:id="@android:id/list"
-        style="@style/OsmandListView"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
         android:layout_weight="1"></ListView>
diff --git a/OsmAnd/res/layout/search_address_online.xml b/OsmAnd/res/layout/search_address_online.xml
index 7cb59a7ed6..9d2b4c17bc 100644
--- a/OsmAnd/res/layout/search_address_online.xml
+++ b/OsmAnd/res/layout/search_address_online.xml
@@ -39,7 +39,6 @@
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        style="@style/OsmandListView"/>
+        android:layout_weight="1"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_by_name.xml b/OsmAnd/res/layout/search_by_name.xml
index f328604317..6c4ec147c4 100644
--- a/OsmAnd/res/layout/search_by_name.xml
+++ b/OsmAnd/res/layout/search_by_name.xml
@@ -40,7 +40,6 @@
 
     <ListView
         android:id="@android:id/list"
-        style="@style/OsmandListView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_marginLeft="3dp"
diff --git a/OsmAnd/res/layout/search_history.xml b/OsmAnd/res/layout/search_history.xml
index b5d817024f..7f24664584 100644
--- a/OsmAnd/res/layout/search_history.xml
+++ b/OsmAnd/res/layout/search_history.xml
@@ -8,8 +8,7 @@
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
-		android:layout_weight="1"
-        style="@style/OsmandListView"/>
+		android:layout_weight="1"/>
 
     <Button
         android:id="@+id/clearAll"
diff --git a/OsmAnd/res/layout/search_transport.xml b/OsmAnd/res/layout/search_transport.xml
index a94714beaf..a546497ab9 100644
--- a/OsmAnd/res/layout/search_transport.xml
+++ b/OsmAnd/res/layout/search_transport.xml
@@ -40,15 +40,13 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_below="@+id/listView"
-            style="@style/OsmandListView" />
+            android:layout_below="@+id/listView"/>
 
         <ListView
             android:id="@+id/listView"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            style="@style/OsmandListView" />
+            android:layout_alignParentTop="true"/>
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoi.xml b/OsmAnd/res/layout/searchpoi.xml
index 6bc24a5438..37bc804b3e 100644
--- a/OsmAnd/res/layout/searchpoi.xml
+++ b/OsmAnd/res/layout/searchpoi.xml
@@ -32,7 +32,6 @@
 
     <ListView
         android:id="@android:id/list"
-        style="@style/OsmandListView"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
             android:layout_weight="1"/>
@@ -42,6 +41,6 @@
             android:background="?attr/bottomToolBarColor"
             android:id="@+id/bottomControls"
             android:layout_width="fill_parent"
-			android:layout_height="@dimen/bottom_tool_bar_size"/>
+			android:layout_height="wrap_content"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/stdlist.xml b/OsmAnd/res/layout/stdlist.xml
index 61696f9af9..3f2ac35177 100644
--- a/OsmAnd/res/layout/stdlist.xml
+++ b/OsmAnd/res/layout/stdlist.xml
@@ -7,7 +7,6 @@
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        style="@style/OsmandListView"></ListView>
+        android:layout_height="fill_parent"></ListView>
 
 </LinearLayout>
\ No newline at end of file