diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 6478ce3521..fed8601e39 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -302,6 +302,7 @@ repositories {
 dependencies {
 	compile project(path: ":OsmAnd-java", configuration: "android")
 	compile project(":eclipse-compile:design")
+	compile project(":cardview")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],
diff --git a/OsmAnd/res/drawable-xhdpi/bg_first_usage.webp b/OsmAnd/res/drawable-xhdpi/bg_first_usage.webp
new file mode 100644
index 0000000000..4900083e15
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/bg_first_usage.webp differ
diff --git a/OsmAnd/res/layout/first_usage_fragment.xml b/OsmAnd/res/layout/first_usage_fragment.xml
new file mode 100644
index 0000000000..f26e8d280c
--- /dev/null
+++ b/OsmAnd/res/layout/first_usage_fragment.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:osmand="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/bg_first_usage"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/color_transparent"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical"
+        android:paddingBottom="16dp"
+        android:paddingLeft="40dp"
+        android:paddingRight="40dp"
+        android:paddingTop="@dimen/first_usage_title_margin"
+        android:layout_gravity="center_horizontal">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/app_name_osmand"
+            android:textColor="@color/color_white"
+            android:textSize="@dimen/first_usage_title_text_size"
+            android:textStyle="bold"
+            osmand:typeface="@string/font_roboto_regular"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-thin"
+            android:text="@string/offline_maps_and_navigation"
+            android:textColor="@color/color_white"
+            android:textSize="@dimen/first_usage_title_text_size"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Download map"
+            android:textColor="@color/color_white"
+            android:textSize="@dimen/default_list_text_size"
+            osmand:typeface="@string/font_roboto_regular"/>
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/card_view"
+            android:layout_width="280dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center"
+            osmand:cardCornerRadius="2dp">
+
+            <EditText
+                android:id="@+id/searchEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="12dp"
+                android:background="@null"
+                android:drawableLeft="@drawable/ic_action_search_dark"
+                android:drawablePadding="12dp"
+                android:gravity="center_vertical"
+                android:hint="Enter country name"
+                android:textSize="@dimen/default_list_text_size"/>
+
+        </android.support.v7.widget.CardView>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/skip_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/shared_string_skip"
+            android:textColor="@color/dashboard_general_button_text_light"/>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 568f207877..4ba4f8cf96 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -46,5 +46,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         layout="@layout/dashboard_over_map" />
+    <FrameLayout
+        android:id="@+id/fragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 02539171fe..4374311a7f 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -520,7 +520,7 @@
   <string name="fast_route_mode">Vinnigste roete</string>
   <string name="fast_route_mode_descr">"Skakel aan om vinnigste roete te bereken of skakel af vir kortste roete " </string>
   <string name="tiles_to_download_estimated_size">Teen vergroting {0} laai {1} teëls af ({2} MB)</string>
-  <string name="context_menu_item_download_map">laai kaart af</string>
+  <string name="shared_string_download_map">laai kaart af</string>
   <string name="select_max_zoom_preload_area">Kies maksimum vergroting om vooraf te laai</string>
   <string name="maps_could_not_be_downloaded">Hierdie kaart kan nie afgelaai word nie</string>
   <string name="continuous_rendering">deurlopende lewering</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index b878112ca8..21790be1b4 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -1901,7 +1901,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="daynight_mode_night">ليل</string>
 	<string name="daynight_mode_auto">الشروق/الغروب</string>
 	<string name="daynight_mode_sensor">مستشعر الضوء</string>
-	<string name="context_menu_item_download_map">تحميل الخريطة</string>
+	<string name="shared_string_download_map">تحميل الخريطة</string>
 	<string name="select_max_zoom_preload_area">حدد أقصى تقريب للتحميل المسبق</string>
 	<string name="maps_could_not_be_downloaded">لم يمكن تحميل هذه الخريطة</string>
 	<string name="download_type_to_filter">اكتب للتصفية</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 1372fb0031..93514dd5c6 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -1445,7 +1445,7 @@
 	<string name="fast_route_mode">Najchutčejšy šliach</string>
 	<string name="fast_route_mode_descr">"Paznačyć kab raźlіčvać najchutčejšy šliach, cі źniać paznaku dlia najkaraciejšaha šliachu "</string>
 	<string name="tiles_to_download_estimated_size">Na maštabie {0} zahruzіć {1} frahmientaŭ ({2} MB)</string>
-	<string name="context_menu_item_download_map">Spampavać mapu</string>
+	<string name="shared_string_download_map">Spampavać mapu</string>
 	<string name="select_max_zoom_preload_area">Vybierycie maksіmaĺnaje pavielіčeńnie dlia papiaredniaj zahruzkі</string>
 	<string name="maps_could_not_be_downloaded">Hetaja mapa nie moža być zahružana</string>
 	<string name="continuous_rendering">Biespierapynnaja admalioŭka</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 68a657d082..3d55ff3f6f 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -916,7 +916,7 @@
 	<string name="fast_route_mode">Найхутчэйшы шлях</string>
 	<string name="fast_route_mode_descr">Пазначыць каб разьлічваць найхутчэйшы шлях, ці зьняць пазнаку для найкарацейшага шляху </string>
 	<string name="tiles_to_download_estimated_size">На маштабе {0} сьцягнуць {1} фрагмэнтаў ({2} МБ)</string>
-	<string name="context_menu_item_download_map">Сьцягнуць мапу</string>
+	<string name="shared_string_download_map">Сьцягнуць мапу</string>
 	<string name="select_max_zoom_preload_area">Выберыце максімальнае павелічэньне для папярэдняй загрузкі</string>
 	<string name="maps_could_not_be_downloaded">Гэтую мапу нельга сьцягнуць</string>
 	<string name="continuous_rendering">Бесперапынная адмалёўка</string>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index d3ec1fb68c..e56ce3aeb1 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -1171,7 +1171,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="fast_route_mode">Най-бърз маршрут</string>
 	<string name="fast_route_mode_descr">Отметнете за изчисляване на най-бърз маршрут. Ако няма отметка се изчислява най-къс маршрут. </string>
 	<string name="tiles_to_download_estimated_size">При мащаб {0} свалете {1} плочки ({2} MB)</string>
-	<string name="context_menu_item_download_map">Сваляне на карта</string>
+	<string name="shared_string_download_map">Сваляне на карта</string>
 	<string name="select_max_zoom_preload_area">Изберете максималният мащаб</string>
 	<string name="maps_could_not_be_downloaded">Тази карта не може да бъде свалена</string>
 	<string name="continuous_rendering">Непрекъснато изчертаване</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 1cf3e0f4f9..d1863c1f3c 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -516,7 +516,7 @@
 <string name="shared_string_select_all">Selecciona-ho tot</string>
 <string name="fast_route_mode">La ruta més ràpida</string>
 <string name="fast_route_mode_descr">Activeu per calcular la ruta més ràpida o desactiveu per calcular la més curta </string>
-<string name="context_menu_item_download_map">Baixa el mapa</string>
+<string name="shared_string_download_map">Baixa el mapa</string>
 <string name="tiles_to_download_estimated_size">Per al nivell de zoom {0} es baixaran {1} tessel·les ({2} MB)</string>
 <string name="shared_string_ok">D\'acord</string>
 <string name="shared_string_no_thanks">No, gràcies</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 1e4a6c8726..6392ca0aef 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -459,7 +459,7 @@
   <string name="fast_route_mode">Nejrychlejší trasa</string>
   <string name="fast_route_mode_descr">Zapněte pro výpočet nejrychlejší trasy, vypněte, pokud chcete hledat tu nejkratší </string>
   <string name="tiles_to_download_estimated_size">Pro zvětšení {0} je třeba stáhnout {1} mapových dlaždic, celkem {2} MB</string>
-  <string name="context_menu_item_download_map">Stáhnout mapu</string>
+  <string name="shared_string_download_map">Stáhnout mapu</string>
   <string name="select_max_zoom_preload_area">Vyberte maximální zvětšení stahovaných map</string>
   <string name="maps_could_not_be_downloaded">Tuto mapu nelze stáhnout</string>
   <string name="continuous_rendering">Průběžné vykreslování</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index cfea667278..60eefedc92 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -844,7 +844,7 @@
 	<string name="fast_route_mode">Hurtigste rute</string>
 	<string name="fast_route_mode_descr">Aktiver for at beregne den hurtigste rute. Deaktiver for at beregne korteste rute </string>
 	<string name="tiles_to_download_estimated_size">Ved zoom {0} hent {1} kortfliser ({2} MB)</string>
-	<string name="context_menu_item_download_map">Hent kort</string>
+	<string name="shared_string_download_map">Hent kort</string>
 	<string name="select_max_zoom_preload_area">Vælg maksimal zoom der skal indlæses på forhånd</string>
 	<string name="maps_could_not_be_downloaded">Kortet kunne ikke hentes</string>
 	<string name="continuous_rendering">Kontinuerlig kortoptegning</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index f6184bfa8a..0042a71914 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -823,7 +823,7 @@
 	<string name="fast_route_mode">Schnellste Route</string>
 	<string name="fast_route_mode_descr">Auswählen für schnellste oder deaktivieren für kürzeste Route</string>
 	<string name="tiles_to_download_estimated_size">Bei Zoomlevel {0} lade {1} Kacheln\n ({2} MB)</string>
-	<string name="context_menu_item_download_map">Karte herunterladen</string>
+	<string name="shared_string_download_map">Karte herunterladen</string>
 	<string name="select_max_zoom_preload_area">Wähle maximale zu ladende Vergrößerung</string>
 	<string name="maps_could_not_be_downloaded">Diese Karte konnte nicht geladen werden</string>
 	<string name="continuous_rendering">Kontin. Kartenaufbau</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index e38b1de9ac..5886a1652b 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -686,7 +686,7 @@
 	<string name="fast_route_mode">Ταχύτερη διαδρομή</string>
 	<string name="fast_route_mode_descr">Ενεργοποίηση για υπολογισμό ταχύτερης διαδρομής ή για απενεργοποίηση συντομότερης διαδρομής </string>
 	<string name="tiles_to_download_estimated_size">Στη κλίμακα {0} λήψη {1} πλακίδια ({2} MB)</string>
-	<string name="context_menu_item_download_map">Λήψη χάρτη</string>
+	<string name="shared_string_download_map">Λήψη χάρτη</string>
 	<string name="select_max_zoom_preload_area">Επιλέξτε τη μέγιστη μεγέθυνση για προφόρτωση</string>
 	<string name="maps_could_not_be_downloaded">Αυτός ο χάρτης δεν μπορεί να ληφθεί</string>
 	<string name="continuous_rendering">Συνεχής απεικόνιση</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 0cf716eb99..48f340d518 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -1613,7 +1613,7 @@
 	<string name="fast_route_mode">Ruta más rápida</string>
 	<string name="fast_route_mode_descr">"Active para calcular la ruta más rápida o desactive para la más corta "</string>
 	<string name="tiles_to_download_estimated_size">En la ampliación {0}, descarga {1} teselas ({2} MB)</string>
-	<string name="context_menu_item_download_map">Descargar mapa</string>
+	<string name="shared_string_download_map">Descargar mapa</string>
 	<string name="select_max_zoom_preload_area">Elige la ampliación máxima para precargar</string>
 	<string name="maps_could_not_be_downloaded">No se pudo descargar el mapa</string>
 	<string name="continuous_rendering">Visualización continua</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 2222fb6cd4..c7e2596bfc 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -406,7 +406,7 @@
   <string name="fast_route_mode">Ruta más rápida</string>
   <string name="fast_route_mode_descr">"Habilitar para calcular la ruta más rápida o deshabilitar para la ruta más corta "</string>
   <string name="tiles_to_download_estimated_size">En acercamiento {0} descarga {1} teselas ({2} MB)</string>
-  <string name="context_menu_item_download_map">Descargar mapa</string>
+  <string name="shared_string_download_map">Descargar mapa</string>
   <string name="select_max_zoom_preload_area">Seleccione el acercamiento máximo para precargar</string>
   <string name="maps_could_not_be_downloaded">Este mapa no se pudo descargar</string>
   <string name="continuous_rendering">Visualización continua</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 12d3f6751c..84aa8e31f4 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -814,7 +814,7 @@
   <string name="fast_route_mode">Biderik azkarrena</string>
   <string name="fast_route_mode_descr">Gaitu biderik azkarrenarentzat edo ezgaitu biderik motzenarentzat</string>
   <string name="tiles_to_download_estimated_size">{0} zoomean deskargatu {1} tesela ({2} MB)</string>
-  <string name="context_menu_item_download_map">Mapa deskargatu</string>
+  <string name="shared_string_download_map">Mapa deskargatu</string>
   <string name="select_max_zoom_preload_area">Aukeratu aurrekargatzeko gehienezko zooma</string>
   <string name="maps_could_not_be_downloaded">Mapa ezin izan da deskargatu</string>
   <string name="continuous_rendering">Etengabeko errenderizazioa</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 70d0a8cb15..c2932adf4d 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -657,7 +657,7 @@
 	<string name="shared_string_select_all">انتخاب همه</string>
 	<string name="fast_route_mode">سریعترین مسیر</string>
 	<string name="fast_route_mode_descr">فعال کنید تا مسیر سریعتر محاسبه شود یا غیرفعال کنید تا مسیر کوتاهتر محاسبه شود </string>
-	<string name="context_menu_item_download_map">دانلود نقشه</string>
+	<string name="shared_string_download_map">دانلود نقشه</string>
 	<string name="select_max_zoom_preload_area">انتخاب حداکثر میزان بزرگنمایی برای پیش فرض</string>
 	<string name="show_point_options">استفاده از مکان به عنوان…</string>
 	
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index ed37b84f62..c8e92deccb 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -234,7 +234,7 @@
 	<string name="shared_string_select_all">Valitse kaikki</string>
 	<string name="shared_string_refresh">Päivitä</string>
 	<string name="fast_route_mode">Nopein reitti</string>
-	<string name="context_menu_item_download_map">Lataa kartta</string>
+	<string name="shared_string_download_map">Lataa kartta</string>
 	
 	<string name="context_menu_item_search_transport">Etsi kulkuneuvoa</string>
 	
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index a067f56211..cd3a53fa68 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -399,7 +399,7 @@
   <string name="fast_route_mode">Itinéraire le plus rapide</string>
   <string name="fast_route_mode_descr">"Activer pour calculer l\'itinéraire le plus rapide et désactiver pour calculer l\'itinéraire le plus court "</string>
   <string name="tiles_to_download_estimated_size">Le zoom {0} télécharge {1} carreaux ({2} Mb )</string>
-  <string name="context_menu_item_download_map">Télécharger la carte</string>
+  <string name="shared_string_download_map">Télécharger la carte</string>
   <string name="select_max_zoom_preload_area">Sélectionnez le zoom maximum pour précharger la zone visible</string>
   <string name="maps_could_not_be_downloaded">Impossible de télécharger cette carte</string>
   <string name="continuous_rendering">Affichage continu</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 85de2f1bc9..b79cc0680a 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1339,7 +1339,7 @@
 	<string name="fast_route_mode">Itinerario máis rápido</string>
 	<string name="fast_route_mode_descr">"Active isto para calcular a ruta máis rápida ou desactíveo para a máis curta "</string>
 	<string name="tiles_to_download_estimated_size">Na ampliación {0} descargar {1} teselas ({2} MB)</string>
-	<string name="context_menu_item_download_map">Descargar mapa</string>
+	<string name="shared_string_download_map">Descargar mapa</string>
 	<string name="select_max_zoom_preload_area">Seleccionar a ampliaciń máxima que pré-cargar</string>
 	<string name="maps_could_not_be_downloaded">Non foi posíbel descargar este mapa</string>
 	<string name="continuous_rendering">Renderizado continuo</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 58ee05ba1e..cf302d6bdc 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -713,7 +713,7 @@
 	<string name="fast_route_mode">המסלול המהיר ביותר</string>
 	<string name="fast_route_mode_descr">"יש להפעיל כדי לחשב את המסלול המהיר ביותר או לנטרל כדי לקבל את המסלול הקצר ביותר "</string>
 	<string name="tiles_to_download_estimated_size">ברמת תקריב {0} יש להוריד {1} אריחים ({2} מ״ב)</string>
-	<string name="context_menu_item_download_map">הורדת המפה</string>
+	<string name="shared_string_download_map">הורדת המפה</string>
 	<string name="select_max_zoom_preload_area">יש לבחור את רמת התקריב המרבית כדי לטעון מראש</string>
 	<string name="maps_could_not_be_downloaded">לא ניתן להוריד מפה זאת</string>
 	<string name="continuous_rendering">עיבוד תמונה רציף</string>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index 18b3cb0764..9dbe3ce179 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -511,7 +511,7 @@
 	<string name="use_high_res_maps">Zaslon visoke razlučivosti</string>
 	<string name="phone">Telefon</string>
 	<string name="download_type_to_filter">upišite za filtriranje</string>
-	<string name="context_menu_item_download_map">Preuzmi kartu</string>
+	<string name="shared_string_download_map">Preuzmi kartu</string>
 	<string name="maps_could_not_be_downloaded">Ova karta se ne može preuzeti</string>
 	<string name="daynight">Dnevni/noćni način rada</string>
 	<string name="daynight_descr">Odaberite pravilo za izmjenu između dnevnog i noćnog načina rada</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 17b0cb2384..b190bd6cfa 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -454,7 +454,7 @@
   <string name="fast_route_mode">Leggyorsabb útvonal</string>
   <string name="fast_route_mode_descr">Leggyorsabb útvonal kiszámításának engedélyezése, vagy tiltása a legrövidebb útért </string>
   <string name="tiles_to_download_estimated_size">{0} nagyításnál {1} képkocka letöltése ({2} Mb )</string>
-  <string name="context_menu_item_download_map">Térkép letöltése</string>
+  <string name="shared_string_download_map">Térkép letöltése</string>
   <string name="select_max_zoom_preload_area">Maximális nagyítás kiválasztása a látható terület előtöltéséhez</string>
   <string name="maps_could_not_be_downloaded">Ezt a térképet nem lehet letölteni</string>
   <string name="continuous_rendering">Folyamatos megjelenítés</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index dba23166f9..7dd3745630 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -381,7 +381,7 @@
   <string name="fast_route_mode">Percorso più veloce</string>
   <string name="fast_route_mode_descr">Abilita per calcolare il percorso più veloce o disabilita per il percorso più corto </string>
   <string name="tiles_to_download_estimated_size">Per lo zoom {0} scarica {1} tasselli ({2} MB)</string>
-  <string name="context_menu_item_download_map">Download mappa</string>
+  <string name="shared_string_download_map">Download mappa</string>
   <string name="select_max_zoom_preload_area">Seleziona lo zoom massimo da precaricare</string>
   <string name="maps_could_not_be_downloaded">Non è stato possibile scaricare questa mappa</string>
   <string name="continuous_rendering">Disegno continuo</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index c02f9fd220..313733cbd8 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -218,7 +218,7 @@ MB)をダウンロードしますか?</string>
      <string name="fast_route_mode_descr">"有効化なら目的地までの最速ルートで計算、無効化なら最短ルートで計算 "</string>
      <string name="tiles_to_download_estimated_size">ズームレベル {0}で
 {1} 件のタイル({2} MB)をダウンロード</string>
-     <string name="context_menu_item_download_map">マップをダウンロード</string>
+     <string name="shared_string_download_map">マップをダウンロード</string>
      <string name="select_max_zoom_preload_area">プリロードする最大ズームを選択</string>
      <string name="maps_could_not_be_downloaded">このマップはダウンロードできませんでした</string>
 
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index a482bbffc4..cccd9a11a8 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -453,7 +453,7 @@
   <string name="fast_route_mode">უსწრაფესი გზა</string>
   <string name="fast_route_mode_descr">"ჩართეთ უსწრაფესი გზის დასათვლელად ან გამორთეთ უმოკლესისათვის "</string>
   <string name="tiles_to_download_estimated_size">გადიდებისას {0} გადმოსაწერია {1} ნაწილი ({2} MB)</string>
-  <string name="context_menu_item_download_map">რუკის გადმოწერა</string>
+  <string name="shared_string_download_map">რუკის გადმოწერა</string>
   <string name="select_max_zoom_preload_area">აირჩიეთ მაქსიმალური გადიდება ჩასატვირთად</string>
   <string name="maps_could_not_be_downloaded">რუკის გადმოწერა შეუძლებელია</string>
   <string name="continuous_rendering">გაგრძელებადი რენდერი</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 496d9c5901..201a6a0973 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -490,7 +490,7 @@
 	<string name="fast_route_mode">가장 빠른 경로</string>
 	<string name="fast_route_mode_descr">"가장 빠른 경로를 활성화하거나 or 가장 짧은 경로를 비활성화합니다 "</string>
 	<string name="tiles_to_download_estimated_size">줌에서 {0} 다운로드 {1} 타일 ({2} MB)</string>
-	<string name="context_menu_item_download_map">맵 다운로드</string>
+	<string name="shared_string_download_map">맵 다운로드</string>
 	<string name="select_max_zoom_preload_area">가시 영역을 미리 로드하기 위한 최대 줌 선택</string>
 	<string name="maps_could_not_be_downloaded">맵을 다운로드할 수 없습니다</string>
 	
diff --git a/OsmAnd/res/values-land/dimens.xml b/OsmAnd/res/values-land/dimens.xml
new file mode 100644
index 0000000000..03e0b0de49
--- /dev/null
+++ b/OsmAnd/res/values-land/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="first_usage_title_margin">33dp</dimen>
+    <dimen name="first_usage_title_text_size">30sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 5b63b27b2b..ceb4a21ecc 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -595,7 +595,7 @@
   <string name="fast_route_mode">Greičiausias maršrutas</string>
   <string name="fast_route_mode_descr">Įjunkite, kad būtų skaičiuojamas greičiausias maršrutas. Priešingu atveju bus skaičiuojamas trumpiausias maršrutas </string>
   <string name="tiles_to_download_estimated_size">Esant {0} dydžiui parsiųsti {1} žemėlapio lakštus ({2} MB)</string>
-  <string name="context_menu_item_download_map">Parsiųsti žemėlapį</string>
+  <string name="shared_string_download_map">Parsiųsti žemėlapį</string>
   <string name="select_max_zoom_preload_area">Pasirinkite didžiausią dydį, kurį parsiųsti</string>
   <string name="maps_could_not_be_downloaded">Šio žemėlapio parsiųsti nepavyko</string>
   <string name="continuous_rendering">Nenutrūkstamas vaizdavimas</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 647b859a7a..b6c31f59c2 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -447,7 +447,7 @@
   <string name="fast_route_mode">Ātrākais maršruts</string>
   <string name="fast_route_mode_descr">Iespējot, lai rēķinātu ātrāko maršrutu vai atspējot, lai rēķinātu īsāko maršrutu </string>
   <string name="tiles_to_download_estimated_size">Palielinājumam {0} lejupielādēt {1} attēlus ({2} MB)</string>
-  <string name="context_menu_item_download_map">Lejupielādēt karti</string>
+  <string name="shared_string_download_map">Lejupielādēt karti</string>
   <string name="select_max_zoom_preload_area">Izvēlēties maksimālo palielinājumu pirmsielādei</string>
   <string name="maps_could_not_be_downloaded">Karti nevar lejupielādēt</string>
   <string name="continuous_rendering">Nepārtrauktā renderēšana</string>
diff --git a/OsmAnd/res/values-mr/strings.xml b/OsmAnd/res/values-mr/strings.xml
index b23e26e179..f43bf6d933 100644
--- a/OsmAnd/res/values-mr/strings.xml
+++ b/OsmAnd/res/values-mr/strings.xml
@@ -173,7 +173,7 @@
   <string name="shared_string_select_all">सर्व निवडा</string>
   <string name="fast_route_mode">वेगवान रस्ता</string>
   <string name="fast_route_mode_descr">निवडा सर्वात वेगवान रस्त्यासाठी किंवा निवड काढा सर्वात जवळच्या रस्त्यासाठी </string>
-  <string name="context_menu_item_download_map">नकाशा डाउनलोड करा</string>
+  <string name="shared_string_download_map">नकाशा डाउनलोड करा</string>
   <string name="poi_context_menu_website">पिओआय वेबसाइट दाखवा</string>
   <string name="poi_context_menu_call">पिओआय फोन दाखवा</string>
   <string name="website">वेबसाइट</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 48ebefd911..7a49deac5d 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -402,7 +402,7 @@
 	<string name="fast_route_mode">Raskeste rute</string>
 	<string name="fast_route_mode_descr">Aktiver for å beregne raskeste rute eller deaktiver for korteste rute </string>
 	<string name="tiles_to_download_estimated_size">Ved zoom {0} last ned {1} fliser ({2} MB)</string>
-	<string name="context_menu_item_download_map">Last ned kart</string>
+	<string name="shared_string_download_map">Last ned kart</string>
 	<string name="renderers">Vektor-opptegning</string>
 	<string name="renderers_descr">Velg utseende på opptegningen</string>
 	<string name="website">Nettsted</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 2537f17933..0eb1300d90 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -476,7 +476,7 @@
   <string name="fast_route_mode">Snelste route</string>
   <string name="fast_route_mode_descr">Activeer voor de snelste route of deactiveer voor de kortste route </string>
   <string name="tiles_to_download_estimated_size">Op zoom {0} omvat de download {1} kaartsegmenten ({2} MB)</string>
-  <string name="context_menu_item_download_map">Download kaart</string>
+  <string name="shared_string_download_map">Download kaart</string>
   <string name="select_max_zoom_preload_area">Kies maximum zoom om vooraf te laden</string>
   <string name="maps_could_not_be_downloaded">Kaarten konden niet worden gedownload</string>
   <string name="continuous_rendering">Continue kaartgeneratie</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index f366a9e5eb..dcbbc5bc84 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -301,7 +301,7 @@
   <string name="fast_route_mode">Najszybsza trasa</string>
   <string name="fast_route_mode_descr">"Wyznacza najszybszą trasę zamiast najkrótszej "</string>
   <string name="tiles_to_download_estimated_size">Na poziomie {0} pobrano {1} kafelków ({2} MB)</string>
-  <string name="context_menu_item_download_map">Pobierz mapę</string>
+  <string name="shared_string_download_map">Pobierz mapę</string>
   <string name="select_max_zoom_preload_area">Wybierz maksymalne przybliżenie do pobrania</string>
   <string name="maps_could_not_be_downloaded">Nie udało się pobrać tej mapy</string>
   <string name="continuous_rendering">Rysowanie ciągłe</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index a4b58f7ff8..b9d3a074f1 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1416,7 +1416,7 @@
 	<string name="fast_route_mode">Rota mais rápida</string>
 	<string name="fast_route_mode_descr">"Ative para calcular a rota mais rápida ou desative para calcular a rota mais curta "</string>
 	<string name="tiles_to_download_estimated_size">No zoom {0}: baixar {1} imagens ({2} MB)</string>
-	<string name="context_menu_item_download_map">Baixar mapa</string>
+	<string name="shared_string_download_map">Baixar mapa</string>
 	<string name="select_max_zoom_preload_area">Selecionar zoom máximo para pré-carregar</string>
 	<string name="maps_could_not_be_downloaded">Não é possível baixar este mapa</string>
 	<string name="continuous_rendering">Renderização contínua</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 1aea349178..78e58934ce 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -65,7 +65,7 @@
   <string name="fast_route_mode">Caminho mais rápido</string>
   <string name="fast_route_mode_descr">Ative para calcular a rota mais rápida ou desative para calcular a rota mais curta </string>
   <string name="tiles_to_download_estimated_size">Zoom {0}: baixar {1} imagens ({2} MB )</string>
-  <string name="context_menu_item_download_map">Baixar mapa</string>
+  <string name="shared_string_download_map">Baixar mapa</string>
   <string name="select_max_zoom_preload_area">Zoom máximo para baixar</string>
   <string name="maps_could_not_be_downloaded">Não é possível fazer o download deste mapa</string>
   <string name="continuous_rendering">Processamento contínuo</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index b570006d84..e91fae603b 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -738,7 +738,7 @@
 	<string name="fast_route_mode">Cea mai rapidă rută</string>
 	<string name="fast_route_mode_descr">Activați pentru a calcula ruta cea mai rapidă sau dezactivați pentru ruta cea mai scurtă </string>
 	<string name="tiles_to_download_estimated_size">La nivelul de zoom {0} se descarcă {1} porțiuni ({2} MB)</string>
-	<string name="context_menu_item_download_map">Descarcă harta</string>
+	<string name="shared_string_download_map">Descarcă harta</string>
 	<string name="select_max_zoom_preload_area">Selectați nivelul de zoom maxim pentru pre-încărcare</string>
 	<string name="maps_could_not_be_downloaded">Harta nu s-a putut descărca</string>
 	<string name="continuous_rendering">Randare continuă</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 20aa2691c2..3cf7b0f2f1 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -501,7 +501,7 @@
   <string name="fast_route_mode">Скоростной маршрут</string>
   <string name="fast_route_mode_descr">Расчёт скоростного маршрута вместо кратчайшего </string>
   <string name="tiles_to_download_estimated_size">На масштабе {0} загрузить {1} тайлов ({2} Mb )</string>
-  <string name="context_menu_item_download_map">Загрузить карту</string>
+  <string name="shared_string_download_map">Загрузить карту</string>
   <string name="select_max_zoom_preload_area">Выберите максимальный масштаб для загрузки видимой области</string>
   <string name="maps_could_not_be_downloaded">Выбранная карта не может быть загружена</string>
   <string name="continuous_rendering">Непрерывный рендеринг</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 6e25ee2030..1ff4dc58f5 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1313,7 +1313,7 @@
 	<string name="shared_string_select_all">Ischerta totu</string>
 	<string name="fast_route_mode">Àndala prus lestra</string>
 	<string name="tiles_to_download_estimated_size">Pro su zoom {0} iscàrriga {1} tasseddos ({2} MB)</string>
-	<string name="context_menu_item_download_map">Iscàrriga mapa</string>
+	<string name="shared_string_download_map">Iscàrriga mapa</string>
 	<string name="maps_could_not_be_downloaded">No est istadu possìbile iscarrigare custa mapa</string>
 	<string name="show_point_options">Imprea sa positzione …</string>
 	<string name="renderer_load_sucess">Disinnu carrigadu</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index ae330a660a..316f88e217 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -571,7 +571,7 @@
   <string name="fast_route_mode">Najrýchlejšia trasa</string>
   <string name="fast_route_mode_descr">Zapnite na výpočet najrýchlejšej trasy alebo vypnite pre najkratšiu trasu </string>
   <string name="tiles_to_download_estimated_size">Pri priblížení {0} sa stiahne {1} dlaždíc ({2} Mb )</string>
-  <string name="context_menu_item_download_map">Stiahnuť mapu</string>
+  <string name="shared_string_download_map">Stiahnuť mapu</string>
   <string name="select_max_zoom_preload_area">Vybrať max. priblíženie viditeľnej oblasti na načítanie</string>
   <string name="maps_could_not_be_downloaded">Táto mapa sa nedá stiahnuť</string>
   <string name="continuous_rendering">Postupné vykresľovanie</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 68c919f072..4c8eaf25c8 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -825,7 +825,7 @@
 	<string name="shared_string_select_all">Izberi vse</string>
 	<string name="shared_string_refresh">Osveži</string>
 	<string name="tiles_to_download_estimated_size">Pri povečavi {0} prejmi {1} ploščic ({2} MB)</string>
-	<string name="context_menu_item_download_map">Prejem zemljevida</string>
+	<string name="shared_string_download_map">Prejem zemljevida</string>
 	<string name="select_max_zoom_preload_area">Izberite največjo povečavo za predhodno nalaganje</string>
 	<string name="maps_could_not_be_downloaded">Tega zemljevida ni mogoče prejeti</string>
 	<string name="continuous_rendering">Stalno izrisovanje</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 109eb47ffa..74ea990a1d 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -643,7 +643,7 @@
 	<string name="fast_route_mode">Snabbaste vägen</string>
 	<string name="fast_route_mode_descr">Aktivera för att beräkna den snabbaste vägen eller inaktivera för den kortaste vägen </string>
 	<string name="tiles_to_download_estimated_size">Vid zoom {0} hämta {1} kartbitar ({2} MB)</string>
-	<string name="context_menu_item_download_map">Ladda ner karta</string>
+	<string name="shared_string_download_map">Ladda ner karta</string>
 	<string name="poi_filter_sightseeing">Sevärdheter</string>
     <string name="index_settings">Hantera kartfiler</string>
 	<string name="tip_day_night_mode_t_v2">"Kartans utseende kan för vissa vektorkartor ändras mellan dag (ljusare) och natt (mörkare).
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index aaf0849f24..034c90ac5e 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -393,7 +393,7 @@
 	<string name="shared_string_select_all">Hepsini seç</string>
 	<string name="shared_string_refresh">Yenile</string>
 	<string name="fast_route_mode">En hızlı rota</string>
-	<string name="context_menu_item_download_map">Haritayı indir</string>
+	<string name="shared_string_download_map">Haritayı indir</string>
 	<string name="maps_could_not_be_downloaded">Bu harita indirilemedi</string>
 	<string name="phone">Telefon</string>
 	<string name="use_high_res_maps">Yüksek çözünürlüklü ekran</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index fcb7a0876f..a30bf3ea95 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -520,7 +520,7 @@
   <string name="fast_route_mode">Найшвидший маршрут</string>
   <string name="fast_route_mode_descr">Надавати перевагу найшвидшому маршруту перед найкоротшим </string>
   <string name="tiles_to_download_estimated_size">На масштабі{0} завантажувати {1} тайли ({2} MB)</string>
-  <string name="context_menu_item_download_map">Завантажити мапу</string>
+  <string name="shared_string_download_map">Завантажити мапу</string>
   <string name="select_max_zoom_preload_area">Вибрати максимальний масштаб для завантаження</string>
   <string name="maps_could_not_be_downloaded">Дана мапа не може бути завантажена</string>
   <string name="continuous_rendering">Безперервний рендеринг</string>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index be2e675978..c0f91803d7 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -287,7 +287,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
 	<string name="fast_route_mode">Nhanh nhất</string>
 	<string name="fast_route_mode_descr">Bật/tắt tính năng tìm đường đi nhanh nhất</string>
 	<string name="tiles_to_download_estimated_size">Tại mức zoom {0} tải về {1} tiles ({2} MB)</string>
-	<string name="context_menu_item_download_map">Tải bản đồ</string>
+	<string name="shared_string_download_map">Tải bản đồ</string>
 	<string name="select_max_zoom_preload_area">Lựa chọn Zoom lớn nhất để tải lại</string>
 	<string name="maps_could_not_be_downloaded">Bản đồ này không tải được</string>
 
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index c4321e129d..dc3c54ebed 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -766,7 +766,7 @@
 	<string name="shared_string_select_all">全部选中</string>
 	<string name="fast_route_mode">最快路线</string>
 	<string name="fast_route_mode_descr">打开则规划最快路线，关闭则计算最短路线 </string>
-	<string name="context_menu_item_download_map">下载地图</string>
+	<string name="shared_string_download_map">下载地图</string>
 	<string name="maps_could_not_be_downloaded">此地图无法下载</string>
 	<string name="rendering_exception">渲染选中区域时发生错误</string>
 	<string name="show_point_options">使用位置 …</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 56f120cf2d..310bd8d76e 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -628,7 +628,7 @@
 	<string name="fast_route_mode">最快路線</string>
 	<string name="fast_route_mode_descr">啟用為預估最快的路線而停用則為最短的路線 </string>
 	<string name="tiles_to_download_estimated_size">在縮放第{0}級別，下載{1}張地圖圖磚({2} MB)</string>
-	<string name="context_menu_item_download_map">下載地圖</string>
+	<string name="shared_string_download_map">下載地圖</string>
 	<string name="select_max_zoom_preload_area">選擇要預載的最大縮放級別</string>
 	<string name="maps_could_not_be_downloaded">此地圖無法下載</string>
 	<string name="continuous_rendering">連續繪製</string>
diff --git a/OsmAnd/res/values/dimens.xml b/OsmAnd/res/values/dimens.xml
index 1f434fefd9..e83ac0b6a9 100644
--- a/OsmAnd/res/values/dimens.xml
+++ b/OsmAnd/res/values/dimens.xml
@@ -3,4 +3,6 @@
   <dimen name="app_defaultsize_h">400dip</dimen>
   <dimen name="app_minimumsize_w">400dip</dimen>
   <dimen name="app_minimumsize_h">200dip</dimen>
+  <dimen name="first_usage_title_margin">87dp</dimen>
+  <dimen name="first_usage_title_text_size">35sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 99d824111c..5aff817050 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1901,7 +1901,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="fast_route_mode">Fastest route</string>
 	<string name="fast_route_mode_descr">Enable to calculate fastest route or disable for shortest route </string>
 	<string name="tiles_to_download_estimated_size">At zoom {0} download {1} tiles ({2} MB)</string>
-	<string name="context_menu_item_download_map">Download map</string>
+	<string name="shared_string_download_map">Download map</string>
 	<string name="select_max_zoom_preload_area">Select maximum zoom to preload</string>
 	<string name="maps_could_not_be_downloaded">This map could not be downloaded</string>
 	<string name="continuous_rendering">Continuous rendering</string>
@@ -2229,4 +2229,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="dahboard_options_dialog_title">Dashboard options</string>
 	<string name="shared_string_card_was_hidden">Card was hidden</string>
 	<string name="shared_string_undo">UNDO</string>
+	<string name="shared_string_skip">Skip</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation"><![CDATA[Offline Maps\n& Navigation]]></string>
 </resources>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index ce8ec18e2b..abdabf94cc 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -86,7 +86,8 @@
         <item name="android:textColorPrimary">@color/color_black</item>
         <item name="spinnerItemTextColor">@color/color_black</item>
 		<item name="spinnerListBackground">@color/spinner_list_background_light</item>
-		
+		<item name="colorButtonNormal">@color/color_white</item>
+
 		<item name="android:actionModeBackground">@color/actionbar_light_color</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
         <item name="android:actionModeCloseDrawable">@drawable/ic_action_mode_back</item>
@@ -126,7 +127,8 @@
 		<item name="android:textColorPrimary">@color/color_white</item>
 		<item name="spinnerItemTextColor">@color/color_white</item>
 		<item name="spinnerListBackground">@color/spinner_list_background_dark</item>
-		
+		<item name="colorButtonNormal">@color/color_white</item>
+
 		<item name="android:actionModeBackground">@color/actionbar_dark_color</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
 	</style>
@@ -201,6 +203,4 @@
 		<item name="@android:windowEnterAnimation">@anim/grow_from_bottom</item>
 		<item name="@android:windowExitAnimation">@anim/shrink_from_top</item>
 	</style>
-	
-	        
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java b/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
new file mode 100644
index 0000000000..9e6acb5afb
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
@@ -0,0 +1,74 @@
+package net.osmand.plus;
+
+import android.annotation.TargetApi;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.download.DownloadActivity;
+
+public class FirstUsageFragment extends Fragment {
+	public static final String TAG = "FirstUsageFragment";
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.first_usage_fragment, container, false);
+		final EditText editText = (EditText) view.findViewById(R.id.searchEditText);
+		Drawable searchIcon = ((MapActivity) getActivity()).getMyApplication().getIconsCache()
+				.getContentIcon(R.drawable.ic_action_search_dark);
+		editText.setCompoundDrawablesWithIntrinsicBounds(searchIcon, null, null, null);
+		Button skipButton = (Button) view.findViewById(R.id.skip_button);
+		skipButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				getActivity().getSupportFragmentManager().beginTransaction()
+						.remove(FirstUsageFragment.this).commit();
+			}
+		});
+		editText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+			@Override
+			public void onFocusChange(View v, boolean hasFocus) {
+				if (hasFocus) {
+					getActivity().getSupportFragmentManager().beginTransaction()
+							.remove(FirstUsageFragment.this).commit();
+					final Intent intent = new Intent(getActivity(), DownloadActivity.class);
+					intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB);
+					getActivity().startActivity(intent);
+				}
+			}
+		});
+		return view;
+	}
+
+
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			Window w = getActivity().getWindow(); // in Activity's onCreate() for instance
+			w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+					WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+		}
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			Window w = getActivity().getWindow(); // in Activity's onCreate() for instance
+			w.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 0a0e03abc1..61172fd266 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -1,12 +1,30 @@
 package net.osmand.plus.activities;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import android.app.Dialog;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v4.app.NotificationCompat.Builder;
+import android.support.v7.app.NotificationCompat;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewStub;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import net.osmand.Location;
 import net.osmand.StateChangedListener;
@@ -26,6 +44,7 @@ import net.osmand.plus.AppInitializer.AppInitializeListener;
 import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.BusyIndicator;
+import net.osmand.plus.FirstUsageFragment;
 import net.osmand.plus.OsmAndConstants;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -53,31 +72,14 @@ import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.corenative.NativeCoreContext;
 import net.osmand.render.RenderingRulesStorage;
 import net.osmand.util.Algorithms;
-import android.app.Dialog;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v7.app.NotificationCompat;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewStub;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class MapActivity extends AccessibleActivity {
 
@@ -207,6 +209,12 @@ public class MapActivity extends AccessibleActivity {
 			System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
 		}
 		mapView.refreshMap(true);
+
+		if(getMyApplication().getAppInitializer().isFirstTime(this)) {
+			getSupportFragmentManager().beginTransaction()
+					.add(R.id.fragmentContainer, new FirstUsageFragment(),
+							FirstUsageFragment.TAG).commit();
+		}
 	}
 
 	private void checkAppInitialization() {
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
index da4a876ccc..ac6440b83b 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
@@ -1,9 +1,18 @@
 package net.osmand.plus.rastermaps;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.Toast;
 
 import net.osmand.IndexConstants;
 import net.osmand.ResultMatcher;
@@ -26,19 +35,11 @@ import net.osmand.plus.activities.MapActivityLayers;
 import net.osmand.plus.views.MapTileLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.Algorithms;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.os.AsyncTask;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.Toast;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public class OsmandRasterMapsPlugin extends OsmandPlugin {
 	public static final String ID = "osmand.rastermaps";
@@ -237,7 +238,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int resId, int pos, boolean isChecked) {
 					if (resId == R.string.context_menu_item_update_map) {
 						mapActivity.getMapActions().reloadTile(mapView.getZoom(), latitude, longitude);
-					} else if (resId == R.string.context_menu_item_download_map) {
+					} else if (resId == R.string.shared_string_download_map) {
 						DownloadTilesDialog dlg = new DownloadTilesDialog(mapActivity, (OsmandApplication) mapActivity.getApplication(), mapView);
 						dlg.openDialog();
 					}
@@ -246,7 +247,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 			};
 			adapter.item(R.string.context_menu_item_update_map).iconColor(R.drawable.ic_action_refresh_dark)
 					.listen(listener).reg();
-			adapter.item(R.string.context_menu_item_download_map).iconColor(R.drawable.ic_action_import)
+			adapter.item(R.string.shared_string_download_map).iconColor(R.drawable.ic_action_import)
 					.listen(listener).reg();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java b/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java
index e6ddf2ef47..f3648e4ab2 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/TextViewEx.java
@@ -4,12 +4,12 @@ import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Canvas;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.support.v7.internal.text.AllCapsTransformationMethod;
 import android.util.AttributeSet;
 import android.widget.TextView;
+
 import net.osmand.plus.R;
 import net.osmand.plus.helpers.FontCache;
 
@@ -66,8 +66,9 @@ public class TextViewEx extends TextView {
 
 		String typefaceName = resolvedAttributes.getString(R.styleable.TextViewEx_typeface);
 		Typeface typeface = FontCache.getFont(target.getContext(), typefaceName);
+		int style = target.getTypeface() == null ? 0 : target.getTypeface().getStyle();
 		if (typeface != null)
-			target.setTypeface(typeface);
+			target.setTypeface(typeface, style);
 	}
 
 	public static void setAllCapsCompat(TextView target, boolean allCaps) {
diff --git a/cardview/build.gradle b/cardview/build.gradle
new file mode 100644
index 0000000000..391b3c602c
--- /dev/null
+++ b/cardview/build.gradle
@@ -0,0 +1,22 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 7
+        targetSdkVersion 21
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile files('libs/android-support-v7-cardview.jar')
+}
diff --git a/cardview/libs/android-support-v7-cardview.jar b/cardview/libs/android-support-v7-cardview.jar
new file mode 100644
index 0000000000..09e4e386c0
Binary files /dev/null and b/cardview/libs/android-support-v7-cardview.jar differ
diff --git a/cardview/src/main/AndroidManifest.xml b/cardview/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..3ef02dc9d6
--- /dev/null
+++ b/cardview/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.support.v7.cardview">
+    <uses-sdk android:minSdkVersion="7"/>
+    <application />
+</manifest>
diff --git a/cardview/src/main/res/values/attrs.xml b/cardview/src/main/res/values/attrs.xml
new file mode 100644
index 0000000000..a0bd67d861
--- /dev/null
+++ b/cardview/src/main/res/values/attrs.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <declare-styleable name="CardView">
+        <!-- Background color for CardView. -->
+        <attr name="cardBackgroundColor" format="color" />
+        <!-- Corner radius for CardView. -->
+        <attr name="cardCornerRadius" format="dimension" />
+        <!-- Elevation for CardView. -->
+        <attr name="cardElevation" format="dimension" />
+        <!-- Maximum Elevation for CardView. -->
+        <attr name="cardMaxElevation" format="dimension" />
+        <!-- Add padding in API v21+ as well to have the same measurements with previous versions. -->
+        <attr name="cardUseCompatPadding" format="boolean" />
+        <!-- Add padding to CardView on v20 and before to prevent intersections between the Card content and rounded corners. -->
+        <attr name="cardPreventCornerOverlap" format="boolean" />
+        <!-- Inner padding between the edges of the Card and children of the CardView. -->
+        <attr name="contentPadding" format="dimension" />
+        <!-- Inner padding between the left edge of the Card and children of the CardView. -->
+        <attr name="contentPaddingLeft" format="dimension" />
+        <!-- Inner padding between the right edge of the Card and children of the CardView. -->
+        <attr name="contentPaddingRight" format="dimension" />
+        <!-- Inner padding between the top edge of the Card and children of the CardView. -->
+        <attr name="contentPaddingTop" format="dimension" />
+        <!-- Inner padding between the bottom edge of the Card and children of the CardView. -->
+        <attr name="contentPaddingBottom" format="dimension" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/cardview/src/main/res/values/colors.xml b/cardview/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..3ed7087fe4
--- /dev/null
+++ b/cardview/src/main/res/values/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Background color for light CardView. -->
+    <color name="cardview_light_background">#FFFAFAFA</color>
+	<!-- Background color for dark CardView. -->
+	<color name="cardview_dark_background">#FF202020</color>
+    <!-- Shadow color for the first pixels around CardView. -->
+    <color name="cardview_shadow_start_color">#37000000</color>
+    <!-- Shadow color for the furthest pixels around CardView. -->
+    <color name="cardview_shadow_end_color">#03000000</color>
+</resources>
\ No newline at end of file
diff --git a/cardview/src/main/res/values/dimens.xml b/cardview/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..ebfbb3a971
--- /dev/null
+++ b/cardview/src/main/res/values/dimens.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Default radius for CardView corners. -->
+    <dimen name="cardview_default_radius">2dp</dimen>
+    <!-- Elevation value to use for CardViews. Pre-L, it is equal to shadow size. -->
+    <dimen name="cardview_default_elevation">2dp</dimen>
+    <!-- Inset shadow for RoundRectDrawableWithShadow. It is used to avoid gaps between the card
+     and the shadow. -->
+    <dimen name="cardview_compat_inset_shadow">1dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/cardview/src/main/res/values/styles.xml b/cardview/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..99dfbc98cc
--- /dev/null
+++ b/cardview/src/main/res/values/styles.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <style name="CardView">
+        <item name="cardBackgroundColor">@color/cardview_light_background</item>
+        <item name="cardCornerRadius">@dimen/cardview_default_radius</item>
+        <item name="cardElevation">@dimen/cardview_default_elevation</item>
+        <item name="cardMaxElevation">@dimen/cardview_default_elevation</item>
+        <item name="cardUseCompatPadding">false</item>
+        <item name="cardPreventCornerOverlap">true</item>
+    </style>
+    <style name="CardView.Light">
+        <item name="cardBackgroundColor">@color/cardview_light_background</item>
+    </style>
+    <style name="CardView.Dark">
+        <item name="cardBackgroundColor">@color/cardview_dark_background</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/cardview/src/main/resources/.readme b/cardview/src/main/resources/.readme
new file mode 100644
index 0000000000..4bcebad80c
--- /dev/null
+++ b/cardview/src/main/resources/.readme
@@ -0,0 +1,2 @@
+This hidden file is there to ensure there is an src folder.
+Once we support binary library this will go away.
\ No newline at end of file
diff --git a/import-summary.txt b/import-summary.txt
index 6b9133f411..119186d7ce 100644
--- a/import-summary.txt
+++ b/import-summary.txt
@@ -1,23 +1,15 @@
 ECLIPSE ANDROID PROJECT IMPORT SUMMARY
 ======================================
 
-Ignored Files:
---------------
-The following files were *not* copied into the new Gradle project; you
-should evaluate whether these are still needed in your project and if
-so manually move them:
-
-* .DS_Store
-
 Moved Files:
 ------------
 Android Gradle projects use a different directory structure than ADT
 Eclipse projects. Here's how the projects were restructured:
 
-* AndroidManifest.xml => design/src/main/AndroidManifest.xml
-* res/ => design/src/main/res/
-* src/ => design/src/main/java
-* src/.readme => design/src/main/resources/.readme
+* AndroidManifest.xml => cardview/src/main/AndroidManifest.xml
+* res/ => cardview/src/main/res/
+* src/ => cardview/src/main/java
+* src/.readme => cardview/src/main/resources/.readme
 
 Next Steps:
 -----------
diff --git a/settings.gradle b/settings.gradle
index 0bf8c486e5..db61b58ddc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,8 @@
-include ':OsmAnd-java', ':eclipse-compile:design'
+include ':OsmAnd-java', ':eclipse-compile:design', ':cardview'
 include ':OsmAnd'
 include ':eclipse-compile:appcompat'
 include ':plugins:OsmAnd-AddressPlugin'
 include ':plugins:Osmand-ParkingPlugin'
 include ':plugins:Osmand-Sherpafy'
 include ':plugins:Osmand-SRTMPlugin'
+include ':cardview'