diff --git a/android/res/layout/downloader_item.xml b/android/res/layout/downloader_item.xml
index c47631d6c0..8b1e7e457f 100644
--- a/android/res/layout/downloader_item.xml
+++ b/android/res/layout/downloader_item.xml
@@ -75,13 +75,13 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:textAppearance="@style/MwmTextAppearance.Body3"
-      tools:text="100 / 200 MB"/>
+      tools:text="200 MB"/>
 
     <TextView
       android:id="@+id/counts"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:textAppearance="@style/MwmTextAppearance.Body3"
-      tools:text="10 / 20"/>
+      tools:text="10"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/android/res/layout/toolbar_downloader.xml b/android/res/layout/toolbar_downloader.xml
index c0f507a974..f2fd166c17 100644
--- a/android/res/layout/toolbar_downloader.xml
+++ b/android/res/layout/toolbar_downloader.xml
@@ -7,19 +7,18 @@
   android:layout_width="match_parent"
   android:layout_height="?attr/actionBarSize">
   <LinearLayout
-    android:id="@+id/frame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
     android:baselineAligned="false"
-    android:gravity="center_vertical">
+    android:gravity="right|center_vertical">
     <include layout="@layout/toolbar_search_controls"/>
 
     <ImageView
       android:id="@+id/download_all"
       android:layout_width="?actionBarSize"
       android:layout_height="?actionBarSize"
-      android:layout_gravity="end|center_vertical"
+      android:layout_gravity="end"
       android:background="?selectableItemBackgroundBorderless"
       android:scaleType="center"
       android:src="@drawable/ic_download"/>
diff --git a/android/res/layout/toolbar_search_controls.xml b/android/res/layout/toolbar_search_controls.xml
index 94fa348e9a..7334bf1e8a 100644
--- a/android/res/layout/toolbar_search_controls.xml
+++ b/android/res/layout/toolbar_search_controls.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
+<LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools">
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/frame"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="horizontal"
+  android:baselineAligned="false"
+  android:gravity="center_vertical">
   <EditText
     android:id="@+id/query"
     style="@style/MwmTextAppearance.Toolbar.Search"
@@ -51,4 +57,4 @@
     android:src="@drawable/ic_mic_white"
     android:visibility="gone"
     tools:visibility="visible"/>
-</merge>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/res/layout/toolbar_with_search.xml b/android/res/layout/toolbar_with_search.xml
index 17c17b5375..4e4cba6045 100644
--- a/android/res/layout/toolbar_with_search.xml
+++ b/android/res/layout/toolbar_with_search.xml
@@ -6,13 +6,5 @@
     android:theme="@style/MwmWidget.ToolbarTheme"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize">
-  <LinearLayout
-    android:id="@+id/frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:baselineAligned="false"
-    android:gravity="center_vertical">
-    <include layout="@layout/toolbar_search_controls"/>
-  </LinearLayout>
+  <include layout="@layout/toolbar_search_controls"/>
 </android.support.v7.widget.Toolbar>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index e443fc72f2..849c042e70 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -176,6 +176,7 @@
   <style name="MwmWidget.Downloader.ToolbarButton">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">match_parent</item>
+    <item name="android:gravity">center</item>
     <item name="android:layout_gravity">right</item>
     <item name="android:background">?selectableItemBackgroundBorderless</item>
     <item name="android:padding">@dimen/margin_half</item>
diff --git a/android/src/com/mapswithme/maps/downloader/CountryItem.java b/android/src/com/mapswithme/maps/downloader/CountryItem.java
index 966bcbc554..27da0c4a7d 100644
--- a/android/src/com/mapswithme/maps/downloader/CountryItem.java
+++ b/android/src/com/mapswithme/maps/downloader/CountryItem.java
@@ -9,6 +9,8 @@ import android.support.annotation.NonNull;
 @SuppressWarnings("unused")
 public final class CountryItem implements Comparable<CountryItem>
 {
+  public static final String ROOT = MapManager.nativeGetRootNode();
+
   // Must correspond to ItemCategory in MapManager.cpp
   static final int CATEGORY_NEAR_ME = 0;
   static final int CATEGORY_DOWNLOADED = 1;
@@ -50,7 +52,7 @@ public final class CountryItem implements Comparable<CountryItem>
   public int progress;
 
   // Internal ID for grouping under headers in the list
-  public int headerId;
+  int headerId;
 
   public CountryItem(String id)
   {
@@ -118,6 +120,7 @@ public final class CountryItem implements Comparable<CountryItem>
            ", totalSize: " + totalSize +
            ", childCount: " + childCount +
            ", totalChildCount: " + totalChildCount +
+           ", progress: " + progress +
            "}";
   }
 }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java b/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java
index e1ee42f74a..7477a98173 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java
@@ -1,6 +1,5 @@
 package com.mapswithme.maps.downloader;
 
-import android.os.Bundle;
 import android.support.v4.app.Fragment;
 
 import com.mapswithme.maps.base.BaseMwmFragmentActivity;
@@ -16,13 +15,6 @@ public class DownloaderActivity extends BaseMwmFragmentActivity
     return DownloaderFragment.class;
   }
 
-  @Override
-  protected void onCreate(Bundle savedInstanceState)
-  {
-    super.onCreate(savedInstanceState);
-
-  }
-
   @Override
   public void onBackPressed()
   {
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index abeb6e8253..e8bdfe8b8d 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -17,16 +17,19 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
+import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.widget.WheelProgressView;
 import com.mapswithme.util.BottomSheetHelper;
+import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.UiUtils;
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersAdapter;
@@ -39,8 +42,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 {
   private final RecyclerView mRecycler;
   private final Activity mActivity;
+  private final DownloaderFragment mFragment;
   private final StickyRecyclerHeadersDecoration mHeadersDecoration;
 
+  private boolean mSearchResultsMode;
   private final List<CountryItem> mItems = new ArrayList<>();
   private final Map<String, CountryItem> mCountryIndex = new HashMap<>();  // Country.id -> Country
 
@@ -56,9 +61,9 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     DELETE(R.drawable.ic_delete, R.string.delete)
     {
       @Override
-      void invoke(CountryItem item)
+      void invoke(CountryItem item, DownloaderAdapter adapter)
       {
-        CANCEL.invoke(item);
+        CANCEL.invoke(item, adapter);
         MapManager.nativeDelete(item.id);
       }
     },
@@ -66,7 +71,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     CANCEL(R.drawable.ic_cancel, R.string.cancel)
     {
       @Override
-      void invoke(CountryItem item)
+      void invoke(CountryItem item, DownloaderAdapter adapter)
       {
         MapManager.nativeCancel(item.id);
       }
@@ -75,16 +80,18 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     EXPLORE(R.drawable.ic_explore, R.string.zoom_to_country)
     {
       @Override
-      void invoke(CountryItem item)
+      void invoke(CountryItem item, DownloaderAdapter adapter)
       {
-
+        // TODO: Jump to country
+        if (adapter.mActivity instanceof MwmActivity)
+          adapter.mActivity.finish();
       }
     },
 
     UPDATE(R.drawable.ic_update, R.string.downloader_update_map)
     {
       @Override
-      void invoke(CountryItem item)
+      void invoke(CountryItem item, DownloaderAdapter adapter)
       {
         MapManager.nativeGetAttributes(item);
 
@@ -102,18 +109,20 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       this.title = title;
     }
 
-    abstract void invoke(CountryItem item);
+    abstract void invoke(CountryItem item, DownloaderAdapter adapter);
   }
 
   private static class PathEntry
   {
     final String countryId;
+    final String name;
     final int topPosition;
     final int topOffset;
 
-    private PathEntry(String countryId, int topPosition, int topOffset)
+    private PathEntry(String countryId, String name, int topPosition, int topOffset)
     {
       this.countryId = countryId;
+      this.name = name;
       this.topPosition = topPosition;
       this.topOffset = topOffset;
     }
@@ -124,23 +133,16 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     @Override
     public void onStatusChanged(String countryId, int newStatus)
     {
-      CountryItem ci = mCountryIndex.get(countryId);
-      if (ci == null)
-        return;
-
-      MapManager.nativeGetAttributes(ci);
-      // TODO
+      if (mSearchResultsMode)
+        updateItem(countryId);
+      else
+        refreshData();
     }
 
     @Override
     public void onProgress(String countryId, long localSize, long remoteSize)
     {
-      CountryItem ci = mCountryIndex.get(countryId);
-      if (ci == null)
-        return;
-
-      MapManager.nativeGetAttributes(ci);
-      // TODO
+      updateItem(countryId);
     }
   };
 
@@ -231,7 +233,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         @Override
         public boolean onMenuItemClick(android.view.MenuItem item)
         {
-          MenuItem.values()[item.getItemId()].invoke(mItem);
+          MenuItem.values()[item.getItemId()].invoke(mItem, DownloaderAdapter.this);
           return false;
         }
       }).tint().show();
@@ -254,7 +256,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         public void onClick(View v)
         {
           if (mItem.isExpandable())
-            goDeeper(mItem.id);
+            goDeeper(mItem);
           else
             processClick();
         }
@@ -347,8 +349,18 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       mItem = item;
 
       mName.setText(mItem.name);
-      mParentName.setText(mItem.parentName);
-      UiUtils.showIf(!TextUtils.isEmpty(mItem.parentName), mParentName);
+
+      String parent = mItem.parentId;
+      parent = (CountryItem.ROOT.equals(parent) ? "" : mItem.parentName);
+
+      mParentName.setText(parent);
+      UiUtils.showIf(!TextUtils.isEmpty(parent), mParentName);
+
+      mSizes.setText(StringUtils.getFileSizeString(mItem.totalSize));
+
+      UiUtils.showIf(mItem.isExpandable(), mCounts);
+      if (mItem.isExpandable())
+        mCounts.setText(mItem.childCount + " / " + mItem.totalChildCount);
 
       updateStatus();
     }
@@ -418,10 +430,58 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     }
   }
 
+  private void updateItem(String countryId)
+  {
+    CountryItem ci = mCountryIndex.get(countryId);
+    if (ci == null)
+      return;
+
+    MapManager.nativeGetAttributes(ci);
+
+    LinearLayoutManager lm = (LinearLayoutManager)mRecycler.getLayoutManager();
+    int first = lm.findFirstVisibleItemPosition();
+    int last = lm.findLastVisibleItemPosition();
+    if (first == RecyclerView.NO_POSITION || last == RecyclerView.NO_POSITION)
+      return;
+
+    for (int i = first; i <= last; i++)
+    {
+      ViewHolder vh = (ViewHolder)mRecycler.findViewHolderForAdapterPosition(i);
+      if (vh != null && vh.mItem.id.equals(countryId))
+      {
+        vh.bind(vh.mItem);
+        // TODO(trashkalmar): Quit if no duplcates allowed in the list?
+        //return;
+      }
+    }
+  }
+
   private void refreshData()
   {
+    mSearchResultsMode = false;
+
     mItems.clear();
     MapManager.nativeListItems(getCurrentParent(), mItems);
+    processData();
+  }
+
+  void cancelSearch()
+  {
+    if (mSearchResultsMode)
+      refreshData();
+  }
+
+  void setSearchResultsMode(Collection<CountryItem> results)
+  {
+    mSearchResultsMode = true;
+
+    mItems.clear();
+    mItems.addAll(results);
+    processData();
+  }
+
+  private void processData()
+  {
     Collections.<CountryItem>sort(mItems);
     collectHeaders();
 
@@ -433,10 +493,11 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     notifyDataSetChanged();
   }
 
-  DownloaderAdapter(RecyclerView recycler, Activity activity)
+  DownloaderAdapter(DownloaderFragment fragment)
   {
-    mRecycler = recycler;
-    mActivity = activity;
+    mActivity = fragment.getActivity();
+    mFragment = fragment;
+    mRecycler = mFragment.getRecyclerView();
     mHeadersDecoration = new StickyRecyclerHeadersDecoration(this);
     mRecycler.addItemDecoration(mHeadersDecoration);
     refreshData();
@@ -478,7 +539,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     return mItems.size();
   }
 
-  private void goDeeper(String child)
+  private void goDeeper(CountryItem child)
   {
     LinearLayoutManager lm = (LinearLayoutManager)mRecycler.getLayoutManager();
 
@@ -486,8 +547,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     int position = lm.findFirstVisibleItemPosition();
     int offset = lm.findViewByPosition(position).getTop();
 
-    mPath.push(new PathEntry(child, position, offset));
+    mPath.push(new PathEntry(child.id, child.name, position, offset));
     refreshData();
+
+    mFragment.update();
   }
 
   boolean canGoUpdwards()
@@ -506,6 +569,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     LinearLayoutManager lm = (LinearLayoutManager)mRecycler.getLayoutManager();
     lm.scrollToPositionWithOffset(entry.topPosition, entry.topOffset);
 
+    mFragment.update();
     return true;
   }
 
@@ -514,6 +578,11 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     return (canGoUpdwards() ? mPath.peek().countryId : null);
   }
 
+  @Nullable String getCurrentParentName()
+  {
+    return (canGoUpdwards() ? mPath.peek().name : null);
+  }
+
   void attach()
   {
     mListenerSlot = MapManager.nativeSubscribe(mStorageCallback);
@@ -523,4 +592,9 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   {
     MapManager.nativeUnsubscribe(mListenerSlot);
   }
+
+  boolean isSearchResultsMode()
+  {
+    return mSearchResultsMode;
+  }
 }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
index d3fda2457b..7f84510b2a 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
@@ -10,26 +10,31 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
 import com.mapswithme.maps.base.OnBackPressListener;
 import com.mapswithme.maps.search.NativeSearchListener;
 import com.mapswithme.maps.search.SearchEngine;
 import com.mapswithme.maps.search.SearchResult;
-import com.mapswithme.maps.widget.SearchToolbarController;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 
 public class DownloaderFragment extends BaseMwmRecyclerFragment
                              implements OnBackPressListener
 {
-  private ToolbarController mToolbarController;
+  private DownloaderToolbarController mToolbarController;
 
   private View mBottomPanel;
   private Button mPanelAction;
   private TextView mPanelText;
   private DownloaderAdapter mAdapter;
 
+  private long mCurrentSearch;
+  private boolean mSearchRunning;
+
   private int mSubscriberSlot;
 
   private final RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
@@ -43,110 +48,81 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
 
   private final NativeSearchListener mSearchListener = new NativeSearchListener()
   {
+    private final Map<String, CountryItem> mResults = new HashMap<>();
+
     @Override
     public void onResultsUpdate(SearchResult[] results, long timestamp)
     {
+      if (!mSearchRunning || timestamp != mCurrentSearch)
+        return;
 
+      for (SearchResult result: results)
+      {
+        String id = MapManager.nativeFindCountry(result.lat, result.lon);
+        if (!TextUtils.isEmpty(id) && !mResults.containsKey(id))
+        {
+          CountryItem item = CountryItem.fill(id);
+          item.category = CountryItem.CATEGORY_ALL;
+          mResults.put(id, item);
+        }
+      }
     }
 
     @Override
     public void onResultsEnd(long timestamp)
     {
+      if (!mSearchRunning || timestamp != mCurrentSearch)
+        return;
 
+      mAdapter.setSearchResultsMode(mResults.values());
+      mResults.clear();
+
+      onSearchEnd();
     }
   };
 
-  private class ToolbarController extends SearchToolbarController
+  void startSearch()
   {
-    private final View mDownloadAll;
-    private final View mUpdateAll;
-    private final View mCancelAll;
-
-    ToolbarController(View root, Activity activity)
-    {
-      super(root, activity);
-
-      mDownloadAll = mContainer.findViewById(R.id.download_all);
-      mUpdateAll = mContainer.findViewById(R.id.update_all);
-      mCancelAll = mContainer.findViewById(R.id.cancel_all);
-
-      mDownloadAll.setOnClickListener(new View.OnClickListener()
-      {
-        @Override
-        public void onClick(View v)
-        {
-          MapManager.nativeDownload(mAdapter.getCurrentParent());
-        }
-      });
-
-      mUpdateAll.setOnClickListener(new View.OnClickListener()
-      {
-        @Override
-        public void onClick(View v)
-        {
-          MapManager.nativeUpdate(mAdapter.getCurrentParent());
-        }
-      });
-
-      mCancelAll.setOnClickListener(new View.OnClickListener()
-      {
-        @Override
-        public void onClick(View v)
-        {
-          MapManager.nativeCancel(mAdapter.getCurrentParent());
-        }
-      });
-
-      update();
-    }
-
-    @Override
-    public void onUpClick()
-    {
-      if (!onBackPressed())
-        super.onUpClick();
-    }
-
-    public void update()
-    {
-      boolean cancel = MapManager.nativeIsDownloading();
-
-      boolean update = !cancel;
-      if (update)
-      {
-        // TODO (trashkalmar): Use appropriate function
-        update = false;
-      }
-
-      boolean onTop = !mAdapter.canGoUpdwards();
-
-      boolean download = (!cancel && !update && !onTop);
-      if (download)
-      {
-        // TODO (trashkalmar): Use appropriate function
-        download = true;
-      }
-
-      UiUtils.showIf(cancel, mCancelAll);
-      UiUtils.showIf(update, mUpdateAll);
-      UiUtils.showIf(download, mDownloadAll);
-      UiUtils.showIf(onTop, mQuery);
-    }
-
-    @Override
-    protected void startVoiceRecognition(Intent intent, int code)
-    {
-      startActivityForResult(intent, code);
-    }
+    mSearchRunning = true;
+    mCurrentSearch = System.nanoTime();
+    SearchEngine.searchMaps(mToolbarController.getQuery(), mCurrentSearch);
+    mToolbarController.showProgress(true);
   }
 
-  private void updateBottomPanel()
+  void cancelSearch()
   {
-    UpdateInfo info = MapManager.nativeGetUpdateInfo();
-    boolean show = (info != null && info.filesCount > 0);
-    UiUtils.showIf(show, mBottomPanel);
-    if (show)
-      mPanelText.setText(getString(R.string.downloader_maps_to_update, info.filesCount, StringUtils.getFileSizeString(info.totalSize)));
+    onSearchEnd();
+    mAdapter.cancelSearch();
+  }
+
+  private void onSearchEnd()
+  {
+    mSearchRunning = false;
+    mToolbarController.showProgress(false);
+  }
+
+  void update()
+  {
+    String rootName = mAdapter.getCurrentParentName();
+    boolean onTop = (mAdapter.isSearchResultsMode() || rootName == null);
+
+    // Toolbar
+    mToolbarController.update();
+    if (!onTop)
+      mToolbarController.setTitle(rootName);  // FIXME: Title not shown. Investigate this.
+
+    // Bottom panel
+    boolean showBottom = onTop;
+    if (showBottom)
+    {
+      UpdateInfo info = MapManager.nativeGetUpdateInfo();
+      showBottom = (info != null && info.filesCount > 0);
+
+      if (showBottom)
+        mPanelText.setText(getString(R.string.downloader_maps_to_update, info.filesCount, StringUtils.getFileSizeString(info.totalSize)));
+    }
+
+    UiUtils.showIf(showBottom, mBottomPanel);
   }
 
   @Override
@@ -170,8 +146,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
         if (!isAdded())
           return;
 
-        mToolbarController.update();
-        updateBottomPanel();
+        update();
       }
 
       @Override
@@ -192,7 +167,6 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
     }
 
     SearchEngine.INSTANCE.removeListener(mSearchListener);
-    SearchEngine.cancelSearch();
   }
 
   @Override
@@ -208,8 +182,9 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
     mPanelText = (TextView) mBottomPanel.findViewById(R.id.tv__text);
     UiUtils.updateButton(mPanelAction);
 
-    mToolbarController = new ToolbarController(view, getActivity());
-    updateBottomPanel();
+    mToolbarController = new DownloaderToolbarController(view, getActivity(), this);
+
+    update();
   }
 
   @Override
@@ -230,6 +205,12 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
   @Override
   public boolean onBackPressed()
   {
+    if (mToolbarController.hasQuery())
+    {
+      mToolbarController.clear();
+      return true;
+    }
+
     return mAdapter.goUpwards();
   }
 
@@ -243,20 +224,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
   protected RecyclerView.Adapter createAdapter()
   {
     if (mAdapter == null)
-    {
-      mAdapter = new DownloaderAdapter(getRecyclerView(), getActivity());
-      mAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver()
-      {
-        @Override
-        public void onChanged()
-        {
-          boolean root = TextUtils.isEmpty(mAdapter.getCurrentParent());
-          mToolbarController.show(root);
-          if (!root)
-            mToolbarController.setTitle(R.string.download_maps);
-        }
-      });
-    }
+      mAdapter = new DownloaderAdapter(this);
 
     return mAdapter;
   }
@@ -267,4 +235,10 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
     super.onActivityResult(requestCode, resultCode, data);
     mToolbarController.onActivityResult(requestCode, resultCode, data);
   }
+
+  @Override
+  public DownloaderAdapter getAdapter()
+  {
+    return mAdapter;
+  }
 }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderToolbarController.java b/android/src/com/mapswithme/maps/downloader/DownloaderToolbarController.java
new file mode 100644
index 0000000000..403cb409ba
--- /dev/null
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderToolbarController.java
@@ -0,0 +1,116 @@
+package com.mapswithme.maps.downloader;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.widget.SearchToolbarController;
+import com.mapswithme.util.UiUtils;
+
+class DownloaderToolbarController extends SearchToolbarController
+{
+  private final DownloaderFragment mFragment;
+
+  private final View mDownloadAll;
+  private final View mUpdateAll;
+  private final View mCancelAll;
+
+  DownloaderToolbarController(View root, Activity activity, DownloaderFragment fragment)
+  {
+    super(root, activity);
+    mFragment = fragment;
+
+    mDownloadAll = mToolbar.findViewById(R.id.download_all);
+    mUpdateAll = mToolbar.findViewById(R.id.update_all);
+    mCancelAll = mToolbar.findViewById(R.id.cancel_all);
+
+    mDownloadAll.setOnClickListener(new View.OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        MapManager.nativeDownload(mFragment.getAdapter().getCurrentParent());
+      }
+    });
+
+    mUpdateAll.setOnClickListener(new View.OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        MapManager.nativeUpdate(mFragment.getAdapter().getCurrentParent());
+      }
+    });
+
+    mCancelAll.setOnClickListener(new View.OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        MapManager.nativeCancel(mFragment.getAdapter().getCurrentParent());
+      }
+    });
+  }
+
+  @Override
+  protected void onTextChanged(String query)
+  {
+    if (!mFragment.isAdded())
+      return;
+
+    if (TextUtils.isEmpty(query))
+    {
+      mFragment.cancelSearch();
+      return;
+    }
+
+    mFragment.startSearch();
+  }
+
+  @Override
+  public void onUpClick()
+  {
+    mFragment.onBackPressed();
+  }
+
+  public void update()
+  {
+    boolean search = hasQuery();
+    boolean cancel = MapManager.nativeIsDownloading();
+
+    boolean update = (!search && !cancel);
+    if (update)
+    {
+      // TODO (trashkalmar): Use appropriate function
+      update = false;
+    }
+
+    boolean onTop = !mFragment.getAdapter().canGoUpdwards();
+
+    boolean download = (!search && !cancel && !update && !onTop);
+    if (download)
+    {
+      // TODO (trashkalmar): Use appropriate function
+      download = true;
+    }
+
+    UiUtils.showIf(cancel, mCancelAll);
+    UiUtils.showIf(update, mUpdateAll);
+    UiUtils.showIf(download, mDownloadAll);
+    showControls(onTop);
+  }
+
+  @Override
+  protected int getVoiceInputPrompt()
+  {
+    return R.string.search_map;
+  }
+
+  @Override
+  protected void startVoiceRecognition(Intent intent, int code)
+  {
+    mFragment.startActivityForResult(intent, code);
+  }
+}
diff --git a/android/src/com/mapswithme/maps/downloader/SelectMigrationFragment.java b/android/src/com/mapswithme/maps/downloader/SelectMigrationFragment.java
index 3900012329..91fb301814 100644
--- a/android/src/com/mapswithme/maps/downloader/SelectMigrationFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/SelectMigrationFragment.java
@@ -9,7 +9,7 @@ public class SelectMigrationFragment extends BaseMwmRecyclerFragment
   @Override
   protected RecyclerView.Adapter createAdapter()
   {
-    // TODO customize download adapter to allow selections
-    return new DownloaderAdapter(getRecyclerView(), getActivity());
+    // TODO
+    return null;
   }
 }
diff --git a/android/src/com/mapswithme/maps/search/SearchEngine.java b/android/src/com/mapswithme/maps/search/SearchEngine.java
index 89458995ba..ddb1c26f81 100644
--- a/android/src/com/mapswithme/maps/search/SearchEngine.java
+++ b/android/src/com/mapswithme/maps/search/SearchEngine.java
@@ -87,14 +87,12 @@ public enum SearchEngine implements NativeSearchListener
     } catch (UnsupportedEncodingException ignored) { }
   }
 
-  public static boolean searchMaps(String query)
+  public static void searchMaps(String query, long timestamp)
   {
     try
     {
-      return nativeRunSearchMaps(query.getBytes("utf-8"), Language.getKeyboardLocale(), System.nanoTime());
+      nativeRunSearchMaps(query.getBytes("utf-8"), Language.getKeyboardLocale(), timestamp);
     } catch (UnsupportedEncodingException ignored) { }
-
-    return false;
   }
 
   public static String getQuery()
@@ -140,7 +138,7 @@ public enum SearchEngine implements NativeSearchListener
   /**
    * @param bytes utf-8 formatted query bytes
    */
-  private static native boolean nativeRunSearchMaps(byte[] bytes, String language, long timestamp);
+  private static native void nativeRunSearchMaps(byte[] bytes, String language, long timestamp);
 
   private static native void nativeShowResult(int index);
 
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index ed5bb0eb61..b808950dcf 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -179,10 +179,10 @@ public class SearchFragment extends BaseMwmFragment
 
   private void updateFrames()
   {
-    final boolean active = searchActive();
-    UiUtils.showIf(active, mResultsFrame);
+    final boolean hasQuery = mToolbarController.hasQuery();
+    UiUtils.showIf(hasQuery, mResultsFrame);
 
-    if (active)
+    if (hasQuery)
       hideDownloadSuggest();
     else if (doShowDownloadSuggest())
       showDownloadSuggest();
@@ -194,7 +194,7 @@ public class SearchFragment extends BaseMwmFragment
   {
     final boolean show = (!mSearchRunning &&
                           mSearchAdapter.getItemCount() == 0 &&
-                          searchActive());
+                          mToolbarController.hasQuery());
 
     UiUtils.showIf(show, mResultsPlaceholder);
   }
@@ -300,11 +300,6 @@ public class SearchFragment extends BaseMwmFragment
     mToolbarController.setQuery(text);
   }
 
-  private boolean searchActive()
-  {
-    return !getQuery().isEmpty();
-  }
-
   private void readArguments()
   {
     final Bundle arguments = getArguments();
@@ -422,7 +417,7 @@ public class SearchFragment extends BaseMwmFragment
   @Override
   public void onResultsUpdate(SearchResult[] results, long timestamp)
   {
-    if (!isAdded() || !searchActive())
+    if (!isAdded() || !mToolbarController.hasQuery())
       return;
 
     // Search is running hence results updated.
@@ -455,7 +450,7 @@ public class SearchFragment extends BaseMwmFragment
   @Override
   public boolean onBackPressed()
   {
-    if (searchActive())
+    if (mToolbarController.hasQuery())
     {
       mToolbarController.clear();
       return true;
diff --git a/android/src/com/mapswithme/maps/widget/SearchToolbarController.java b/android/src/com/mapswithme/maps/widget/SearchToolbarController.java
index 0aa7b71438..7593c9c7f8 100644
--- a/android/src/com/mapswithme/maps/widget/SearchToolbarController.java
+++ b/android/src/com/mapswithme/maps/widget/SearchToolbarController.java
@@ -140,6 +140,11 @@ public class SearchToolbarController extends ToolbarController
     setQuery("");
   }
 
+  public boolean hasQuery()
+  {
+    return !getQuery().isEmpty();
+  }
+
   public void activate()
   {
     mQuery.requestFocus();
@@ -176,7 +181,7 @@ public class SearchToolbarController extends ToolbarController
     }
   }
 
-  public void show(boolean show)
+  public void showControls(boolean show)
   {
     UiUtils.showIf(show, mContainer);
   }