diff --git a/android/res/layout/map.xml b/android/res/layout/map.xml
index ceb4b1dc26..e6c87276d1 100644
--- a/android/res/layout/map.xml
+++ b/android/res/layout/map.xml
@@ -12,11 +12,17 @@
         android:layout_gravity="bottom|center_horizontal"
         android:background="@android:color/transparent" />
 
+    <!--
+    	Default margin = @dimen/map_controls_margin - 1 (like in map_button_bottom)
+     	Right margin = @dimen/zoom_margin + @dimen/zoom_margin_right - 1 (like in map_navigation_buttons)
+    -->
     <include
         android:id="@+id/omni_box"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp"
+        android:layout_marginLeft="6dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginRight="8dp"
         layout="@layout/search_box" />
 
     <include
diff --git a/android/res/layout/search_category_item.xml b/android/res/layout/search_category_item.xml
index 5e51223ca5..e90668cca9 100644
--- a/android/res/layout/search_category_item.xml
+++ b/android/res/layout/search_category_item.xml
@@ -3,12 +3,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingBottom="8dp"
+    android:paddingBottom="5dp"
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
-    android:paddingTop="8dp" >
+    android:paddingTop="4dp" >
 
     <TextView
         android:id="@+id/search_item_name"
diff --git a/android/res/layout/search_item.xml b/android/res/layout/search_item.xml
index f27a1e81fa..0ada30b5c4 100644
--- a/android/res/layout/search_item.xml
+++ b/android/res/layout/search_item.xml
@@ -4,12 +4,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingBottom="8dp"
+    android:paddingBottom="5dp"
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
-    android:paddingTop="8dp" >
+    android:paddingTop="4dp" >
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/android/res/layout/search_list_view.xml b/android/res/layout/search_list_view.xml
index 1a16590c2a..aa9e36571e 100644
--- a/android/res/layout/search_list_view.xml
+++ b/android/res/layout/search_list_view.xml
@@ -19,15 +19,17 @@
             android:layout_marginBottom="0dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="0dp"
             layout="@layout/search_box" />
 
+        <!--
         <RadioGroup
             android:id="@+id/search_scope"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:padding="8dp" >
+            android:padding="8dp"
+            android:visibility="gone" >
 
             <RadioButton
                 android:id="@+id/search_scope_near"
@@ -86,6 +88,7 @@
             android:layout_width="match_parent"
             android:layout_height="2dp"
             android:background="@drawable/horizontal_two_px_separator" />
+    -->
     </LinearLayout>
 
     <ListView
diff --git a/android/src/com/mapswithme/maps/SearchActivity.java b/android/src/com/mapswithme/maps/SearchActivity.java
index 0e7157428c..fa94a4d719 100644
--- a/android/src/com/mapswithme/maps/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/SearchActivity.java
@@ -478,14 +478,16 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
     });
   }
 
-  private void setSearchGroupSelectionByMode(final int savedSearchMode)
+  private void setSearchGroupSelectionByMode(int savedSearchMode)
   {
+    /*
     switch (savedSearchMode)
     {
       case ALL:         mSearchScopeGroup.check(R.id.search_scope_everywhere); break;
       case IN_VIEWPORT: mSearchScopeGroup.check(R.id.search_scope_on_screen);  break;
       default:          mSearchScopeGroup.check(R.id.search_scope_near);       break;
     }
+    */
   }
 
   @Override
@@ -578,6 +580,7 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
 
   private void setUpSearchModes()
   {
+    /*
     // Initialize search modes group
     mSearchScopeGroup = (RadioGroup)findViewById(R.id.search_scope);
     // Default mode is AROUND_POSITION
@@ -603,6 +606,7 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
         runSearch(mode);
       }
     });
+    */
   }
 
   @Override