diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index 7b96dcb66c..51932946ca 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -25,7 +25,4 @@
     <string name="tag_poi_name">name</string>
     <string name="hint_tag">Tag</string>
     <string name="hint_value">Value</string>
-    <string name="live_updates_on">Live updates on</string>
-    <string name="live_updates_off">Live updates off</string>
-    <string name="map_update_date">"Map update date: %s"</string>
 </resources>
diff --git a/OsmAnd/res/layout/dialog_live_updates_item_settings.xml b/OsmAnd/res/layout/dialog_live_updates_item_settings.xml
index facafd82b2..05b4a9a932 100644
--- a/OsmAnd/res/layout/dialog_live_updates_item_settings.xml
+++ b/OsmAnd/res/layout/dialog_live_updates_item_settings.xml
@@ -3,8 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:theme="@style/OsmandLightTheme">
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -29,14 +28,14 @@
             android:background="@color/white_50_transparent"/>
 
         <TextView
-            android:id="@+id/lastCheckTextView"
+            android:id="@+id/lastMapChangeTextView"
             android:layout_width="wrap_content"
             android:layout_height="32dp"
             android:layout_gravity="bottom"
             android:gravity="center"
             android:textColor="@color/color_white"
             android:textSize="12sp"
-            tools:text="Last check: 4 Dec 2015, 14:41"/>
+            tools:text="@string/last_map_change"/>
 
         <TextView
             android:id="@+id/lastUpdateTextView"
@@ -46,7 +45,7 @@
             android:gravity="center"
             android:textColor="@color/color_white"
             android:textSize="12sp"
-            tools:text="Update: 4 Dec 2015, 14:41"/>
+            tools:text="@string/last_update"/>
     </LinearLayout>
 
     <LinearLayout
@@ -103,14 +102,14 @@
 
         <TextView
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical"
             android:text="@string/update_every"
             android:textSize="16sp"/>
 
-        <!--android:id="@+id/updateFrequencySpinner"-->
         <Spinner
+            android:id="@+id/updateFrequencySpinner"
             style="@style/OsmandLightTheme.Spinner"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -120,21 +119,22 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="54dp"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="16dp">
 
         <TextView
             android:id="@+id/updateTimesOfDayLabel"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="54dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="@string/update_time"
+            android:layout_gravity="center_vertical"
             android:textSize="16sp"/>
 
-        <!--android:id="@+id/updateTimesOfDaySpinner"-->
         <Spinner
+            android:id="@+id/updateTimesOfDaySpinner"
             style="@style/OsmandLightTheme.Spinner"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 44a886889a..ea714a1bb4 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2131,7 +2131,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="update_now">Update now</string>
     <string name="missing_write_external_storage_permission">App have no permission to use SD card</string>
     <string name="last_update">Last update: %s</string>
-    <string name="update_date_pattern">"Update: %s"</string>
     <string name="update_time">Update time</string>
     <string name="updates_size_pattern">"Updates: %s"</string>
+    <string name="last_map_change">"Last map change: %s"</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java
index c191710f30..81c185d457 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java
@@ -62,7 +62,7 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
 		View view = LayoutInflater.from(getActivity())
 				.inflate(R.layout.dialog_live_updates_item_settings, null);
 		final TextView regionNameTextView = (TextView) view.findViewById(R.id.regionNameTextView);
-		final TextView lastCheckTextView = (TextView) view.findViewById(R.id.lastCheckTextView);
+		final TextView lastMapChangeTextView = (TextView) view.findViewById(R.id.lastMapChangeTextView);
 		final TextView lastUpdateTextView = (TextView) view.findViewById(R.id.lastUpdateTextView);
 		final SwitchCompat liveUpdatesSwitch = (SwitchCompat) view.findViewById(R.id.liveUpdatesSwitch);
 		final CheckBox downloadOverWiFiCheckBox = (CheckBox) view.findViewById(R.id.downloadOverWiFiSwitch);
@@ -80,8 +80,8 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
 		String lastUpdateDate = formatDateTime(getActivity(), timestamp);
 		final long mapTimestamp = changesManager.getMapTimestamp(fileNameWithoutExtension);
 		String lastCheckDate = formatDateTime(getActivity(), mapTimestamp);
-		lastCheckTextView.setText(getString(R.string.map_update_date, lastCheckDate));
-		lastUpdateTextView.setText(getString(R.string.update_date_pattern, lastUpdateDate));
+		lastMapChangeTextView.setText(getString(R.string.last_map_change, lastCheckDate));
+		lastUpdateTextView.setText(getString(R.string.last_update, lastUpdateDate));
 		final OsmandSettings.CommonPreference<Boolean> liveUpdatePreference =
 				preferenceForLocalIndex(localIndexInfo, getSettings());
 		final OsmandSettings.CommonPreference<Boolean> downloadViaWiFiPreference =