diff --git a/android/res/layout/downloader_bottom_panel.xml b/android/res/layout/downloader_bottom_panel.xml
index f13e70d763..39cc9df49c 100644
--- a/android/res/layout/downloader_bottom_panel.xml
+++ b/android/res/layout/downloader_bottom_panel.xml
@@ -16,7 +16,7 @@
     android:gravity="center_vertical"
     android:singleLine="true"
     android:ellipsize="end"
-    tools:text="@string/downloader_maps_to_update"/>
+    tools:text="@string/downloader_status_maps"/>
 
   <Button
     android:id="@+id/btn__action"
@@ -24,5 +24,5 @@
     android:layout_height="@dimen/height_item_oneline"
     style="@style/MwmWidget.Button"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:text="@string/downloader_update_all"/>
+    android:text="@string/downloader_update_all_button"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/fragment_migrate.xml b/android/res/layout/fragment_migrate.xml
index 327c36dfee..980d278c47 100644
--- a/android/res/layout/fragment_migrate.xml
+++ b/android/res/layout/fragment_migrate.xml
@@ -25,14 +25,14 @@
       android:layout_height="wrap_content"
       android:layout_marginBottom="@dimen/margin_base"
       android:gravity="center"
-      android:text="@string/youve_been_asking"
+      android:text="@string/whatsnew_smallmwm_header"
       android:textAppearance="@style/MwmTextAppearance.Title"/>
 
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:gravity="center"
-      android:text="@string/migrate_and_split_mwms_message"
+      android:text="@string/whatsnew_smallmwm_message"
       android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
     <Space
@@ -55,7 +55,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginBottom="@dimen/margin_base"
-      android:text="Preparing…"
+      android:text="@string/migration_prefetch_status"
       android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
     <FrameLayout
@@ -64,7 +64,7 @@
       android:layout_marginBottom="@dimen/margin_base">
       <Button
         android:id="@+id/button_primary"
-        android:text="@string/downloader_update_all"
+        android:text="@string/migration_update_all_button"
         style="@style/MwmWidget.Button.Accent"/>
 
       <com.mapswithme.maps.widget.WheelProgressView
@@ -82,7 +82,7 @@
     <Button
       android:id="@+id/button_secondary"
       style="@style/MwmWidget.Button"
-      android:text="@string/delete_old_maps"
+      android:text="@string/migration_delete_all_download_current_button"
       android:textColor="?colorAccent"/>
   </LinearLayout>
 </com.mapswithme.maps.widget.HeightLimitedFrameLayout>
diff --git a/android/res/layout/toolbar_downloader.xml b/android/res/layout/toolbar_downloader.xml
index aa7723b05c..1188c8910b 100644
--- a/android/res/layout/toolbar_downloader.xml
+++ b/android/res/layout/toolbar_downloader.xml
@@ -26,7 +26,7 @@
     <TextView
       android:id="@+id/update_all"
       style="@style/MwmWidget.Downloader.ToolbarButton"
-      android:text="@string/downloader_update_all"/>
+      android:text="@string/downloader_update_all_button"/>
 
     <TextView
       android:id="@+id/cancel_all"
diff --git a/android/res/layout/toolbar_search_controls.xml b/android/res/layout/toolbar_search_controls.xml
index 7334bf1e8a..06431eeb07 100644
--- a/android/res/layout/toolbar_search_controls.xml
+++ b/android/res/layout/toolbar_search_controls.xml
@@ -15,7 +15,7 @@
     android:layout_height="wrap_content"
     android:layout_weight="1"
     android:background="@null"
-    android:hint="@string/search"
+    android:hint="@string/downloader_search_field_hint"
     android:imeOptions="actionSearch|flagNoExtractUi"
     android:inputType="text"
     android:padding="@dimen/margin_quarter"
diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml
index 077c335c60..3e226616d8 100644
--- a/android/res/values/arrays.xml
+++ b/android/res/values/arrays.xml
@@ -66,22 +66,22 @@
   </integer-array>
 
   <string-array name="first_start_titles">
-    <item>First start page 1</item>
-    <item>First start page 2</item>
+    <item>@string/onboarding_offline_navigation_title</item>
+    <item>@string/onboarding_offline_maps_title</item>
   </string-array>
 
   <string-array name="first_start_subtitles">
-    <item>Some text</item>
-    <item>Some text</item>
+    <item>@string/onboarding_offline_navigation_message</item>
+    <item>@string/onboarding_offline_maps_message</item>
   </string-array>
 
   <string-array name="first_start_switch_titles">
-    <item>Sample switch title</item>
+    <item/>
     <item/>
   </string-array>
 
   <string-array name="first_start_switch_subtitles">
-    <item>Sample switch subtitle</item>
+    <item/>
     <item/>
   </string-array>
 
@@ -93,18 +93,32 @@
   </integer-array>
 
   <string-array name="news_titles">
-    <item>@string/whats_new_night_caption</item>
+    <item>@string/whatsnew_smallmwm_header</item>
+    <item>@string/whatsnew_editor_title</item>
+    <item>@string/whatsnew_search_header</item>
   </string-array>
 
-  <string-array name="news_subtitles">
-    <item>@string/whats_new_night_body</item>
+  <string-array name="news_messages_1">
+    <item>@string/whatsnew_smallmwm_message</item>
+    <item>@string/whatsnew_editor_message_1</item>
+    <item>@string/whatsnew_search_message</item>
+  </string-array>
+
+  <string-array name="news_messages_2">
+    <item/>
+    <item>@string/whatsnew_editor_message_2</item>
+    <item/>
   </string-array>
 
   <string-array name="news_switch_titles">
     <item/>
+    <item/>
+    <item/>
   </string-array>
 
   <string-array name="news_switch_subtitles">
     <item/>
+    <item/>
+    <item/>
   </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java
index 70a7607c39..1f2c0e1298 100644
--- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java
+++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java
@@ -407,7 +407,7 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity
 
     case ERR_DOWNLOAD_ERROR:
       return (ConnectionState.isConnected() ? R.string.download_has_failed
-                                            : R.string.no_internet_connection_detected);
+                                            : R.string.common_check_internet_connection_dialog);
     default:
       return R.string.not_enough_memory;
     }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloadHelper.java b/android/src/com/mapswithme/maps/downloader/DownloadHelper.java
deleted file mode 100644
index 79dc1fc0c2..0000000000
--- a/android/src/com/mapswithme/maps/downloader/DownloadHelper.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mapswithme.maps.downloader;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.util.ConnectionState;
-import com.mapswithme.util.Constants;
-
-public final class DownloadHelper
-{
-  private DownloadHelper() {}
-
-  public interface OnDownloadListener
-  {
-    void onDownload();
-  }
-
-  private static boolean canDownloadWithoutWarning(long size)
-  {
-    return size < 50 * Constants.MB || ConnectionState.isWifiConnected();
-  }
-
-  public static void downloadWithCellularCheck(Activity activity, long size, String name, final OnDownloadListener listener)
-  {
-    if (canDownloadWithoutWarning(size))
-    {
-      listener.onDownload();
-      return;
-    }
-
-    new AlertDialog.Builder(activity)
-        .setMessage(String.format(activity.getString(R.string.no_wifi_ask_cellular_download), name))
-        .setNegativeButton(activity.getString(R.string.close), null)
-        .setPositiveButton(activity.getString(R.string.ok), new DialogInterface.OnClickListener()
-        {
-          @Override
-          public void onClick(DialogInterface dlg, int which)
-          {
-            listener.onDownload();
-            dlg.dismiss();
-          }
-        }).show();
-  }
-}
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index 42cfdba5d3..3981a2b02b 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -104,7 +104,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
         new AlertDialog.Builder(adapter.mActivity)
                        .setTitle(R.string.downloader_delete_map)
-                       .setMessage(R.string.downloader_delete_editor_changes)
+                       .setMessage(R.string.downloader_delete_map_dialog)
                        .setNegativeButton(android.R.string.no, null)
                        .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener()
                        {
@@ -519,7 +519,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         if (ci.category != prev)
         {
           headerId = CountryItem.CATEGORY_NEAR_ME;
-          mHeaders.put(headerId, MwmApplication.get().getString(R.string.downloader_near_me));
+          mHeaders.put(headerId, MwmApplication.get().getString(R.string.downloader_near_me_subtitle));
           prev = ci.category;
         }
         break;
@@ -528,7 +528,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         if (ci.category != prev)
         {
           headerId = CountryItem.CATEGORY_DOWNLOADED;
-          mHeaders.put(headerId, MwmApplication.get().getString(R.string.downloader_downloaded));
+          mHeaders.put(headerId, MwmApplication.get().getString(R.string.downloader_downloaded_subtitle));
           prev = ci.category;
         }
         break;
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
index d6f9b6c651..c93a03f97c 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
@@ -117,7 +117,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
       showBottom = (info != null && info.filesCount > 0);
 
       if (showBottom)
-        mPanelText.setText(getString(R.string.downloader_maps_to_update, info.filesCount, StringUtils.getFileSizeString(info.totalSize)));
+        mPanelText.setText(getString(R.string.downloader_status_maps, String.valueOf(info.filesCount) + " (" + StringUtils.getFileSizeString(info.totalSize) + ")"));
     }
 
     UiUtils.showIf(showBottom, mBottomPanel);
diff --git a/android/src/com/mapswithme/maps/downloader/MapManager.java b/android/src/com/mapswithme/maps/downloader/MapManager.java
index 9f942be117..8925417123 100644
--- a/android/src/com/mapswithme/maps/downloader/MapManager.java
+++ b/android/src/com/mapswithme/maps/downloader/MapManager.java
@@ -92,11 +92,11 @@ public final class MapManager
     switch (errorData.errorCode)
     {
     case CountryItem.ERROR_NO_INTERNET:
-      text = R.string.no_internet_connection_detected;
+      text = R.string.common_check_internet_connection_dialog;
       break;
 
     case CountryItem.ERROR_OOM:
-      text = R.string.not_enough_disk_space;
+      text = R.string.downloader_no_space_title;
       break;
 
     default:
diff --git a/android/src/com/mapswithme/maps/downloader/MigrationFragment.java b/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
index 72c92ee47f..bb1fd8a9dd 100644
--- a/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
@@ -124,11 +124,11 @@ public class MigrationFragment extends BaseMwmFragment
     switch (code)
     {
     case CountryItem.ERROR_OOM:
-      text = R.string.not_enough_disk_space;
+      text = R.string.downloader_no_space_title;
       break;
 
     case CountryItem.ERROR_NO_INTERNET:
-      text = R.string.no_internet_connection_detected;
+      text = R.string.common_check_internet_connection_dialog;
       break;
 
     default:
diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
index fc9d78e0cb..319d11389a 100644
--- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
@@ -191,7 +191,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
         else
         {
           // TODO(yunikkk) set correct error text.
-          UiUtils.showAlertDialog(getActivity(), R.string.not_enough_disk_space);
+          UiUtils.showAlertDialog(getActivity(), R.string.downloader_no_space_title);
         }
         break;
       }
diff --git a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java
index 93d2c93d4d..2e458683b4 100644
--- a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java
+++ b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java
@@ -53,7 +53,20 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment
       Resources res = MwmApplication.get().getResources();
 
       mTitles = res.getStringArray(getTitles());
-      mSubtitles = res.getStringArray(getSubtitles());
+      mSubtitles = res.getStringArray(getSubtitles1());
+
+      int subtitles2 = getSubtitles2();
+      if (subtitles2 != 0)
+      {
+        String[] strings = res.getStringArray(subtitles2);
+        for (int i = 0; i < mSubtitles.length; i++)
+        {
+          String s = strings[i];
+          if (!TextUtils.isEmpty(s))
+            mSubtitles[i] += "\n\n" + s;
+        }
+      }
+
       mSwitchTitles = res.getStringArray(getSwitchTitles());
       mSwitchSubtitles = res.getStringArray(getSwitchSubtitles());
 
@@ -66,7 +79,8 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment
     }
 
     abstract @ArrayRes int getTitles();
-    abstract @ArrayRes int getSubtitles();
+    abstract @ArrayRes int getSubtitles1();
+    abstract @ArrayRes int getSubtitles2();
     abstract @ArrayRes int getSwitchTitles();
     abstract @ArrayRes int getSwitchSubtitles();
     abstract @ArrayRes int getImages();
diff --git a/android/src/com/mapswithme/maps/news/FirstStartFragment.java b/android/src/com/mapswithme/maps/news/FirstStartFragment.java
index 49875c4d27..5e30f657b4 100644
--- a/android/src/com/mapswithme/maps/news/FirstStartFragment.java
+++ b/android/src/com/mapswithme/maps/news/FirstStartFragment.java
@@ -46,11 +46,17 @@ public class FirstStartFragment extends BaseNewsFragment
     }
 
     @Override
-    int getSubtitles()
+    int getSubtitles1()
     {
       return R.array.first_start_subtitles;
     }
 
+    @Override
+    int getSubtitles2()
+    {
+      return 0;
+    }
+
     @Override
     int getSwitchTitles()
     {
diff --git a/android/src/com/mapswithme/maps/news/NewsFragment.java b/android/src/com/mapswithme/maps/news/NewsFragment.java
index 44469adc36..7cad0a37d8 100644
--- a/android/src/com/mapswithme/maps/news/NewsFragment.java
+++ b/android/src/com/mapswithme/maps/news/NewsFragment.java
@@ -18,9 +18,15 @@ public class NewsFragment extends BaseNewsFragment
     }
 
     @Override
-    int getSubtitles()
+    int getSubtitles1()
     {
-      return R.array.news_subtitles;
+      return R.array.news_messages_1;
+    }
+
+    @Override
+    int getSubtitles2()
+    {
+      return R.array.news_messages_2;
     }
 
     @Override
diff --git a/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java b/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java
index 0858afed32..28d9c9ff6d 100644
--- a/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java
+++ b/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java
@@ -64,8 +64,10 @@ class ResultCodesHelper
     case DIFFERENT_MWM:
       messages.add(resources.getString(R.string.routing_failed_cross_mwm_building));
       break;
-    //TODO (@yunitski @marchuk) Add proper dialog for this case.
     case FILE_TOO_OLD:
+      titleRes = R.string.downloader_update_maps;
+      messages.add(resources.getString(R.string.downloader_mwm_migration_dialog));
+      break;
     case ROUTE_NOT_FOUND:
       if (missingCount == 0)
       {