diff --git a/OsmAnd/res/layout-large-land/dashboard.xml b/OsmAnd/res/layout-large-land/dashboard.xml
index 1e48cbdff9..73bd2231ca 100644
--- a/OsmAnd/res/layout-large-land/dashboard.xml
+++ b/OsmAnd/res/layout-large-land/dashboard.xml
@@ -32,14 +32,14 @@
 
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
-						android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
+						android:name="net.osmand.plus.dashboard.DashFavoritesFragment"
 						android:layout_marginTop="@dimen/dashCardMargin"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
-						android:name="net.osmand.plus.dashboard.DashFavoritesFragment"
+						android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
 						android:layout_marginTop="@dimen/dashCardMargin"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
@@ -67,7 +67,7 @@
 
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
-						android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
+						android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
 						android:layout_marginTop="@dimen/dashCardMargin"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 41c50ed252..93038aec2a 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -49,14 +49,14 @@
 
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
-					android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
+					android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
                     android:layout_marginTop="@dimen/dashCardMargin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
-					android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
+					android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
                     android:layout_marginTop="@dimen/dashCardMargin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index f12f7904ae..9e0490ec0f 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2026,4 +2026,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_value_americanRoadAtlas_name">Americký atlas ciest</string>
     <string name="routing_attr_no_new_routing_name">Bez smerovacích pravidiel verzie 1.9</string>
     <string name="routing_attr_no_new_routing_description">Nepoužívať pravidlá výpočtu trasy zavedené vo verzii 1.9</string>
+    <string name="speak_pedestrian">Oznamovať priechody pre chodcov</string>
     </resources>
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index b131f96497..50bc1c7650 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -479,12 +479,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		//fixes issue when local files not shown after switching tabs
-		//TODO: But next line throws NPE in some circumstances when called from dashboard, so needs fixing, commented out for now
-		if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0) {
+		//Next line throws NPE in some circumstances when called from dashboard and listAdpater=null is not checked
+		if (listAdapter != null && listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0) {
 			for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()) {
-				if (info != null) {
-					listAdapter.addLocalIndexInfo(info);
-				}
+				listAdapter.addLocalIndexInfo(info);
 			}
 			listAdapter.sortData();
 			getExpandableListView().setAdapter(listAdapter);