diff --git a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
index f8c24fb1d1..d41fa844ce 100644
--- a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
+++ b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
@@ -3,6 +3,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
+            android:background="?attr/bottom_menu_view_bg"
             tools:context="net.osmand.plus.download.ui.DataStoragePlaceDialogFragment">
 
     <ImageView
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 34b621a61f..29c948cfb0 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -141,8 +141,13 @@
         <item name="colorAccent">@color/color_white</item>
     </style>
 
-    <style name="FreeVersionBanner" parent="OsmandDarkTheme">
-        <item name="android:textColor">@color/color_white</item>
+
+    <style name="OsmandLightTheme.BottomSheet">
+        <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
+    </style>
+
+    <style name="OsmandDarkTheme.BottomSheet">
+        <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -201,6 +206,9 @@
         <item name="contextMenuButtonColor">@color/osmand_orange</item>
     </style>
 
+    <style name="FreeVersionBanner" parent="OsmandDarkTheme">
+        <item name="android:textColor">@color/color_white</item>
+    </style>
 
     <!-- Standard action bar override -->
     <style name="Widget.Styled.ActionBarDark" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
@@ -294,13 +302,11 @@
         <item name="android:textColor">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:layout_width">fill_parent</item>
-        <item name="android:windowBackground">@color/color_white</item>
+        <item name="android:windowBackground">@null</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:backgroundDimAmount">0.3</item>
         <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:textColorPrimary">@color/dashboard_black</item>
-        <item name="android:textColorSecondary">@color/icon_color</item>
     </style>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
index cfd806e5d6..5dfa9bcf7f 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
@@ -34,7 +34,11 @@ public class DataStoragePlaceDialogFragment extends DialogFragment {
 
 	@Override
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
-		final Dialog dialog = new Dialog(getActivity(), R.style.BottomSheet_Dialog);
+		boolean isLightTheme = ((OsmandApplication) getActivity().getApplication())
+				.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
+		int themeId = isLightTheme ? R.style.OsmandLightTheme_BottomSheet
+				: R.style.OsmandDarkTheme_BottomSheet;
+		final Dialog dialog = new Dialog(getActivity(), themeId);
 		dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
 		return dialog;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
index 1d38c7d428..c918851163 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
@@ -82,6 +82,7 @@ public class AdvancedEditPoiFragment extends Fragment
 				(LinearLayout) view.findViewById(R.id.editTagsList);
 
 		final MapPoiTypes mapPoiTypes = ((OsmandApplication) getActivity().getApplication()).getPoiTypes();
+		// TODO: 10/27/15 Probably use executor so loading would be paralleled.
 		new InitTranslatedTypesTask(mapPoiTypes).execute();
 		mAdapter = new TagAdapterLinearLayoutHack(editTagsLineaLayout, getData());
 		// TODO do not restart initialization every time, and probably move initialization to appInit
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
index a4815c9648..7a126a424f 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
@@ -133,7 +133,7 @@ public class DashOsmEditsFragment extends DashBaseFragment
 	// TODO: 9/7/15 Redesign osm notes.
 	private void uploadItem(final OsmPoint point) {
 		AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
-		b.setMessage(getString(R.string.local_osm_changes_upload_all_confirm, 1));
+		b.setMessage(getString(R.string.local_osm_changes_upload_all_confirm));
 		b.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
index 863405ac22..b915e1c412 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
@@ -52,6 +52,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Denis
@@ -509,7 +510,18 @@ public class OsmEditsFragment extends OsmAndListFragment
 				getString(R.string.local_openstreetmap_uploading),
 				ProgressDialog.STYLE_HORIZONTAL).getDialog();
 		OsmEditsUploadListener listener = new OsmEditsUploadListenerHelper(getActivity(),
-				getString(R.string.local_openstreetmap_were_uploaded));
+				getString(R.string.local_openstreetmap_were_uploaded)) {
+			@Override
+			public void uploadEnded(Map<OsmPoint, String> loadErrorsMap) {
+				super.uploadEnded(loadErrorsMap);
+				for (OsmPoint osmPoint : loadErrorsMap.keySet()) {
+					if (loadErrorsMap.get(osmPoint) == null) {
+						listAdapter.remove(osmPoint);
+					}
+				}
+				listAdapter.notifyDataSetChanged();
+			}
+		};
 		UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask(
 				dialog, listener, plugin, remotepoi, remotebug, points.length, closeChangeSet);
 		uploadTask.execute(points);