diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp
index bd390861df..db2b1d0fc4 100644
--- a/android/jni/com/mapswithme/maps/MapManager.cpp
+++ b/android/jni/com/mapswithme/maps/MapManager.cpp
@@ -107,6 +107,9 @@ static void MigrationStatusChangedCallback(TCountryId const & countryId, bool ke
     if (attrs.m_mwmCounter == 1)
       OnMigrationError(attrs.m_error);
     break;
+
+  default:
+    break;
   }
 }
 
@@ -326,13 +329,11 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeRetry(JNIEnv * env, jclass
  GetStorage().RetryDownloadNode(jni::ToNativeString(env, root));
 }
 
-// static boolean nativeUpdate(String root);
-JNIEXPORT jboolean JNICALL
+// static void nativeUpdate(String root);
+JNIEXPORT void JNICALL
 Java_com_mapswithme_maps_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass clazz, jstring root)
 {
-  // FIXME (trashkalmar): Uncomment after method is implemented.
-  //return GetStorage().UpdateNode(jni::ToNativeString(env, root));
-  return true;
+  GetStorage().UpdateNode(jni::ToNativeString(env, root));
 }
 
 // static void nativeCancel(String root);
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 201376f9ac..998c5546b5 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -39,6 +39,7 @@ import com.mapswithme.maps.bookmarks.data.MapObject;
 import com.mapswithme.maps.downloader.DownloaderActivity;
 import com.mapswithme.maps.downloader.DownloaderFragment;
 import com.mapswithme.maps.downloader.MapManager;
+import com.mapswithme.maps.downloader.MigrationFragment;
 import com.mapswithme.maps.downloader.OnmapDownloader;
 import com.mapswithme.maps.editor.AuthFragment;
 import com.mapswithme.maps.editor.EditorActivity;
@@ -98,6 +99,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private static final String[] DOCKED_FRAGMENTS = { SearchFragment.class.getName(),
                                                      DownloaderFragment.class.getName(),
+                                                     MigrationFragment.class.getName(),
                                                      RoutingPlanFragment.class.getName(),
                                                      EditorHostFragment.class.getName(),
                                                      AuthFragment.class.getName() };
@@ -291,7 +293,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     {
       SearchEngine.cancelSearch();
       mSearchController.refreshToolbar();
-      replaceFragment(DownloaderFragment.class, args, null);
+      replaceFragment(MapManager.nativeIsLegacyMode() ? MigrationFragment.class : DownloaderFragment.class, args, null);
     }
     else
     {
@@ -641,11 +643,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (intent.hasExtra(EXTRA_TASK))
       addTask(intent);
     else if (intent.hasExtra(EXTRA_UPDATE_COUNTRIES))
-    {
-      // TODO (trashkalmar): Update all maps in downloader
-      //OldActiveCountryTree.updateAll();
       showDownloader(true);
-    }
   }
 
   private void addTask(Intent intent)
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index 1a49c437bf..afb5d37121 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -112,10 +112,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
         Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_ACTION,
                                        Statistics.params().add(Statistics.EventParam.ACTION, "update")
-                                                 .add(Statistics.EventParam.FROM, "downloader")
-                                                 .add("is_auto", "false")
-                                                 .add("scenario", (item.isExpandable() ? "update_group"
-                                                                                       : "update")));
+                                                          .add(Statistics.EventParam.FROM, "downloader")
+                                                          .add("is_auto", "false")
+                                                          .add("scenario", (item.isExpandable() ? "update_group"
+                                                                                                : "update")));
       }
     };
 
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderToolbarController.java b/android/src/com/mapswithme/maps/downloader/DownloaderToolbarController.java
index 13bca0010f..df94b0a9be 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderToolbarController.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderToolbarController.java
@@ -88,7 +88,8 @@ class DownloaderToolbarController extends SearchToolbarController
   @Override
   public void onUpClick()
   {
-    mFragment.onBackPressed();
+    if (!mFragment.onBackPressed())
+      super.onUpClick();
   }
 
   public void update()
diff --git a/android/src/com/mapswithme/maps/downloader/MapManager.java b/android/src/com/mapswithme/maps/downloader/MapManager.java
index 4492b7bcd6..1edf9a7477 100644
--- a/android/src/com/mapswithme/maps/downloader/MapManager.java
+++ b/android/src/com/mapswithme/maps/downloader/MapManager.java
@@ -142,7 +142,7 @@ public final class MapManager
   /**
    * Enqueues given {@code root} node with its children in downloader.
    */
-  public static native boolean nativeUpdate(String root);
+  public static native void nativeUpdate(String root);
 
   /**
    * Removes given currently downloading {@code root} node and its children from downloader.
diff --git a/android/src/com/mapswithme/maps/downloader/MigrationFragment.java b/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
index 6fc01eb818..72c92ee47f 100644
--- a/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmFragment;
 import com.mapswithme.maps.base.OnBackPressListener;
@@ -140,6 +141,14 @@ public class MigrationFragment extends BaseMwmFragment
   @Override
   public void onComplete()
   {
+    if (!isAdded())
+      return;
+
+    if (getActivity() instanceof MwmActivity)
+      ((MwmActivity)getActivity()).showDownloader(false);
+    else
+      getActivity().recreate();
+
     Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_MIGRATION_COMPLETE);
   }
 
@@ -152,7 +161,6 @@ public class MigrationFragment extends BaseMwmFragment
   @Override
   public boolean onBackPressed()
   {
-    // TODO
     return false;
   }
 }
diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
index 437b8f00cb..13c114dc47 100644
--- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
+++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
@@ -66,48 +66,57 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
     boolean showFrame = (mCurrentCountry != null);
     if (showFrame)
     {
-      boolean showProgress = (mCurrentCountry.status == CountryItem.STATUS_ENQUEUED ||
-                              mCurrentCountry.status == CountryItem.STATUS_PROGRESS);
+      boolean enqueued = (mCurrentCountry.status == CountryItem.STATUS_ENQUEUED);
+      boolean progress = (mCurrentCountry.status == CountryItem.STATUS_PROGRESS);
+      boolean failed = (mCurrentCountry.status == CountryItem.STATUS_FAILED);
 
-      showFrame = (showProgress ||
-                   mCurrentCountry.status == CountryItem.STATUS_DOWNLOADABLE ||
-                   mCurrentCountry.status == CountryItem.STATUS_FAILED);
+      showFrame = (enqueued || progress || failed ||
+                   mCurrentCountry.status == CountryItem.STATUS_DOWNLOADABLE);
 
       if (showFrame)
       {
         boolean hasParent = !TextUtils.isEmpty(mCurrentCountry.parentName);
 
-        UiUtils.showIf(showProgress, mProgress);
-        UiUtils.showIf(!showProgress, mButton);
+        UiUtils.showIf(progress || enqueued, mProgress);
+        UiUtils.showIf(!progress && !enqueued, mButton);
         UiUtils.showIf(hasParent, mParent);
 
         if (hasParent)
           mParent.setText(mCurrentCountry.parentName);
 
         mTitle.setText(mCurrentCountry.name);
-        mSize.setText(StringUtils.getFileSizeString(mCurrentCountry.totalSize));
 
-        if (showProgress)
-          mProgress.setProgress((int)(mCurrentCountry.progress * 100L / mCurrentCountry.totalSize));
+        if (progress)
+        {
+          mSize.setText(StringUtils.getFileSizeString(mCurrentCountry.totalSize));
+          mProgress.setProgress((int) (mCurrentCountry.progress * 100L / mCurrentCountry.totalSize));
+        }
         else
         {
-          boolean success = (mCurrentCountry.status != CountryItem.STATUS_FAILED);
-          if (success &&
-              !MapManager.nativeIsLegacyMode() &&
-              Config.isAutodownloadMaps() &&
-              ConnectionState.isWifiConnected())
+          if (enqueued)
           {
-            MapManager.nativeDownload(mCurrentCountry.id);
-
-            Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_ACTION,
-                                           Statistics.params().add(Statistics.EventParam.ACTION, "download")
-                                                              .add(Statistics.EventParam.FROM, "map")
-                                                              .add("is_auto", "true")
-                                                              .add("scenario", "download"));
+            mSize.setText(R.string.downloader_queued);
+            mProgress.setProgress(0);
           }
+          else
+          {
+            if (!failed &&
+                !MapManager.nativeIsLegacyMode() &&
+                Config.isAutodownloadMaps() &&
+                ConnectionState.isWifiConnected())
+            {
+              MapManager.nativeDownload(mCurrentCountry.id);
 
-          mButton.setText(success ? R.string.download
-                                  : R.string.downloader_retry);
+              Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_ACTION,
+                                             Statistics.params().add(Statistics.EventParam.ACTION, "download")
+                                                       .add(Statistics.EventParam.FROM, "map")
+                                                       .add("is_auto", "true")
+                                                       .add("scenario", "download"));
+            }
+
+            mButton.setText(failed ? R.string.downloader_retry
+                                   : R.string.download);
+          }
         }
       }
     }
@@ -115,7 +124,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
     UiUtils.showIf(showFrame, mFrame);
   }
 
-  public OnmapDownloader(MwmActivity activity)
+  public OnmapDownloader(final MwmActivity activity)
   {
     mFrame = activity.findViewById(R.id.onmap_downloader);
     mParent = (TextView)mFrame.findViewById(R.id.downloader_parent);
@@ -144,7 +153,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
       {
         if (MapManager.nativeIsLegacyMode())
         {
-          // TODO
+          activity.showDownloader(false);
           return;
         }