diff --git a/OsmAnd/res/layout-land/point_editor_fragment.xml b/OsmAnd/res/layout-land/point_editor_fragment.xml
index 82eaecb526..e13bd49e4e 100644
--- a/OsmAnd/res/layout-land/point_editor_fragment.xml
+++ b/OsmAnd/res/layout-land/point_editor_fragment.xml
@@ -78,7 +78,7 @@
android:id="@+id/button_replace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?android:selectableItemBackground"
+ android:background="?attr/selectableItemBackground"
android:textColor="?attr/contextMenuButtonColor"
android:text="@string/update_existing"
android:visibility="gone"/>
diff --git a/OsmAnd/res/layout-xlarge/first_usage_fragment.xml b/OsmAnd/res/layout-xlarge/first_usage_fragment.xml
index bf36b7e8d3..cd15b235ff 100644
--- a/OsmAnd/res/layout-xlarge/first_usage_fragment.xml
+++ b/OsmAnd/res/layout-xlarge/first_usage_fragment.xml
@@ -9,10 +9,11 @@
android:theme="@style/OsmandLightTheme">
+ android:background="@color/osmand_orange"/>
+ android:background="@color/osmand_orange"/>
diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml
index 953885ac12..7a80306ce6 100644
--- a/OsmAnd/res/layout/point_editor_fragment.xml
+++ b/OsmAnd/res/layout/point_editor_fragment.xml
@@ -80,7 +80,7 @@
android:id="@+id/button_replace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?android:selectableItemBackground"
+ android:background="?attr/selectableItemBackground"
android:textColor="?attr/contextMenuButtonColor"
android:text="@string/update_existing"
android:visibility="gone"/>
diff --git a/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java b/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
index 6d256d43b9..63d289dddc 100644
--- a/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
+++ b/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
@@ -14,6 +14,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.ImageView;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivity;
@@ -24,6 +25,12 @@ public class FirstUsageFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.first_usage_fragment, container, false);
+ ImageView backgroundImage = (ImageView) view.findViewById(R.id.background_image);
+ if (Build.VERSION.SDK_INT >= 14) {
+ backgroundImage.setImageResource(R.drawable.bg_first_usage);
+ } else {
+ backgroundImage.setImageDrawable(null);
+ }
final EditText editText = (EditText) view.findViewById(R.id.searchEditText);
Drawable searchIcon = ((MapActivity) getActivity()).getMyApplication().getIconsCache()
.getIcon(R.drawable.ic_action_search_dark, true);
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 0c57c72f8d..383d39ac44 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -23,7 +23,7 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
-import android.widget.Space;
+import android.support.v4.widget.Space;
import android.widget.TextView;
import android.widget.Toast;