diff --git a/android/jni/com/mapswithme/country/CountryTree.cpp b/android/jni/com/mapswithme/country/CountryTree.cpp
index ce534974be..8b94b5f461 100644
--- a/android/jni/com/mapswithme/country/CountryTree.cpp
+++ b/android/jni/com/mapswithme/country/CountryTree.cpp
@@ -135,4 +135,18 @@ extern "C"
   {
     g_framework->ResetCountryTreeListener();
   }
+
+  // FIXME (trashkalmar): Add proper logic
+
+  JNIEXPORT jboolean JNICALL
+  Java_com_mapswithme_country_CountryTree_isDownloadableGroup(JNIEnv * env, jclass clazz)
+  {
+    return true;
+  }
+
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_country_CountryTree_downloadGroup(JNIEnv * env, jclass clazz)
+  {
+
+  }
 }
diff --git a/android/res/layout/fragment_downloader.xml b/android/res/layout/fragment_downloader.xml
index 238bef3762..c6448dc92e 100644
--- a/android/res/layout/fragment_downloader.xml
+++ b/android/res/layout/fragment_downloader.xml
@@ -21,6 +21,15 @@
       android:padding="@dimen/margin_half"
       android:text="@string/downloader_update_all"
       android:textAppearance="@style/MwmTextAppearance.Toolbar.Title.Button"/>
+
+    <ImageView
+      android:id="@+id/download_all"
+      android:layout_width="?actionBarSize"
+      android:layout_height="?actionBarSize"
+      android:layout_gravity="end|center_vertical"
+      android:background="?selectableItemBackgroundBorderless"
+      android:scaleType="center"
+      android:src="@drawable/ic_download_map"/>
   </android.support.v7.widget.Toolbar>
 
   <FrameLayout
diff --git a/android/src/com/mapswithme/country/CountryTree.java b/android/src/com/mapswithme/country/CountryTree.java
index ac561af0d5..06c2258194 100644
--- a/android/src/com/mapswithme/country/CountryTree.java
+++ b/android/src/com/mapswithme/country/CountryTree.java
@@ -43,4 +43,8 @@ public class CountryTree
   public static native void setListener(CountryTreeListener listener);
 
   public static native void resetListener();
+
+  public static native boolean isDownloadableGroup();
+
+  public static native void downloadGroup();
 }
\ No newline at end of file
diff --git a/android/src/com/mapswithme/country/DownloadFragment.java b/android/src/com/mapswithme/country/DownloadFragment.java
index 43a2b958e7..3cc344337c 100644
--- a/android/src/com/mapswithme/country/DownloadFragment.java
+++ b/android/src/com/mapswithme/country/DownloadFragment.java
@@ -15,6 +15,7 @@ import com.mapswithme.maps.base.BaseMwmListFragment;
 import com.mapswithme.maps.base.OnBackPressListener;
 import com.mapswithme.util.Config;
 import com.mapswithme.util.ThemeUtils;
+import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 
 public class DownloadFragment extends BaseMwmListFragment implements View.OnClickListener, ActiveCountryTree.ActiveCountryListener, OnBackPressListener
@@ -22,6 +23,7 @@ public class DownloadFragment extends BaseMwmListFragment implements View.OnClic
   private ExtendedDownloadAdapterWrapper mExtendedAdapter;
   private DownloadedAdapter mDownloadedAdapter;
   private TextView mTvUpdateAll;
+  private View mDownloadAll;
   private int mMode = MODE_DISABLED;
   private int mListenerSlotId;
   private LayoutInflater mLayoutInflater;
@@ -85,9 +87,13 @@ public class DownloadFragment extends BaseMwmListFragment implements View.OnClic
         onBackPressed();
       }
     });
+
     mTvUpdateAll = (TextView) toolbar.findViewById(R.id.tv__update_all);
     mTvUpdateAll.setOnClickListener(this);
-    mTvUpdateAll.setVisibility(View.GONE);
+
+    mDownloadAll = toolbar.findViewById(R.id.download_all);
+    mDownloadAll.setOnClickListener(this);
+    UiUtils.hide(mTvUpdateAll, mDownloadAll);
   }
 
   @Override
@@ -121,7 +127,10 @@ public class DownloadFragment extends BaseMwmListFragment implements View.OnClic
   public boolean onBackPressed()
   {
     if (getDownloadAdapter().onBackPressed())
+    {
       setSelection(0);
+      updateToolbar();
+    }
     else if (getListAdapter() instanceof DownloadedAdapter)
     {
       mMode = MODE_DISABLED;
@@ -144,9 +153,12 @@ public class DownloadFragment extends BaseMwmListFragment implements View.OnClic
     if (mMode == MODE_DISABLED)
     {
       mTvUpdateAll.setVisibility(View.GONE);
+      UiUtils.showIf(CountryTree.hasParent() && CountryTree.isDownloadableGroup(), mDownloadAll);
       return;
     }
 
+    UiUtils.hide(mDownloadAll);
+
     updateMode();
     switch (mMode)
     {
@@ -241,6 +253,10 @@ public class DownloadFragment extends BaseMwmListFragment implements View.OnClic
         ActiveCountryTree.cancelAll();
       updateToolbar();
       break;
+
+    case R.id.download_all:
+      CountryTree.downloadGroup();
+      break;
     }
   }