Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java

@@ -138,6 +138,8 @@ public class RenderingRuleStorageProperties {
 	public RenderingRuleProperty R_ICON_ORDER;
 	public RenderingRuleProperty R_TEXT_MIN_DISTANCE;
 	public RenderingRuleProperty R_TEXT_ON_PATH;
+	public RenderingRuleProperty R_ICON_SHIFT_PX;
+	public RenderingRuleProperty R_ICON_SHIFT_PY;
 	public RenderingRuleProperty R_ICON__1;
 	public RenderingRuleProperty R_ICON;
 	public RenderingRuleProperty R_ICON_2;
@@ -232,6 +234,8 @@ public class RenderingRuleStorageProperties {
 		R_TEXT_ON_PATH = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_ON_PATH));
 
 		// point
+		R_ICON_SHIFT_PX = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty("icon_shift_px"));
+		R_ICON_SHIFT_PY = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty("icon_shift_py"));
 		R_ICON__1 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon__1"));
 		R_ICON = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty(ICON));
 		R_ICON_2 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon_2"));

OsmAnd/res/drawable/cancel_button.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/ic_download_cancel_tap" android:state_selected="true"/>
-	<item android:drawable="@drawable/ic_download_cancel_tap" android:state_pressed="true"/>
-	<item android:drawable="@drawable/ic_download_cancel_normal" android:state_selected="false"/>
-	<item android:drawable="@drawable/ic_download_cancel_normal" android:state_pressed="false"/>
-</selector>

OsmAnd/res/drawable/download_button.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/ic_download_tap" android:state_selected="true"/>
-	<item android:drawable="@drawable/ic_download_tap" android:state_pressed="true"/>
-	<item android:drawable="@drawable/ic_download_normal" android:state_selected="false"/>
-	<item android:drawable="@drawable/ic_download_normal" android:state_pressed="false"/>
-</selector>

OsmAnd/res/drawable/download_disabled.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_download_cancel_tap" />
-</selector>

OsmAnd/res/layout-land/map_hud_bottom.xml

@@ -54,7 +54,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="top|center"
                 android:layout_marginTop="3dp"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <TextView
                 android:id="@+id/map_app_mode_text"
@@ -79,7 +79,7 @@
                 android:layout_width="@dimen/map_button_size"
                 android:layout_height="@dimen/map_button_size"
                 android:background="@drawable/btn_round"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:id="@+id/map_route_info_button"
@@ -87,7 +87,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:layout_marginLeft="@dimen/map_button_spacing_land"
                 android:background="@drawable/btn_round"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
         </LinearLayout>
     </FrameLayout>
 
@@ -162,7 +162,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:id="@+id/map_waypoints_route_button"
@@ -170,7 +170,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:id="@+id/map_options_route_button"
@@ -178,7 +178,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <TextView
                 android:id="@+id/map_go_route_button"
@@ -186,7 +186,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:drawableLeft="@drawable/ic_action_remove_light"
+                android:drawableLeft="@drawable/ic_action_test_light"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:paddingLeft="12dp"
@@ -216,14 +216,14 @@
                 android:layout_height="@dimen/map_address_height"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_circle_transparent"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:layout_width="@dimen/map_address_height"
                 android:layout_height="@dimen/map_address_height"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_circle_transparent"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
         </LinearLayout>
     </FrameLayout>
 
@@ -243,7 +243,7 @@
             android:layout_height="@dimen/map_button_size"
             android:layout_gravity="bottom"
             android:background="@drawable/btn_circle"
-            android:src="@drawable/ic_action_remove_light" />
+            android:src="@drawable/ic_action_test_light" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -257,7 +257,7 @@
                 android:layout_width="@dimen/map_button_size"
                 android:layout_height="@dimen/map_button_size"
                 android:background="@drawable/btn_circle"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:id="@+id/map_zoom_out_button"
@@ -265,7 +265,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:layout_marginTop="@dimen/map_button_spacing_land"
                 android:background="@drawable/btn_circle"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
         </LinearLayout>
     </LinearLayout>
 

OsmAnd/res/layout-land/map_hud_top.xml

@@ -72,7 +72,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="@dimen/map_button_margin"
                     android:layout_marginRight="@dimen/map_button_margin"
-                    android:src="@drawable/ic_action_remove_light" />
+                    android:src="@drawable/ic_action_test_light" />
 
                 <TextView
                     android:id="@+id/waypoint_dist"
@@ -108,7 +108,7 @@
                     android:layout_width="@dimen/map_address_height"
                     android:layout_height="@dimen/map_address_height"
                     android:background="@drawable/btn_circle_transparent"
-                    android:src="@drawable/ic_action_remove_light" />
+                    android:src="@drawable/ic_action_test_light" />
             </LinearLayout>
         </FrameLayout>
 
@@ -168,14 +168,14 @@
                     android:layout_width="@dimen/map_button_size"
                     android:layout_height="@dimen/map_button_size"
                     android:background="@drawable/btn_inset_circle"
-                    android:src="@drawable/ic_action_remove_light" />
+                    android:src="@drawable/ic_action_test_light" />
 
                 <ImageButton
                     android:id="@+id/map_compass_button"
                     android:layout_width="@dimen/map_button_size"
                     android:layout_height="@dimen/map_button_size"
                     android:background="@drawable/btn_inset_circle"
-                    android:src="@drawable/ic_action_remove_light" />
+                    android:src="@drawable/ic_action_test_light" />
             </LinearLayout>
         </FrameLayout>
     </LinearLayout>
@@ -211,7 +211,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:layout_gravity="top|center_horizontal"
                 android:background="@drawable/btn_inset_circle"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
         </LinearLayout>
     </FrameLayout>
 

OsmAnd/res/layout/dash_updates_item.xml

@@ -53,13 +53,14 @@
 				android:visibility="gone" />
 		</LinearLayout>
 
-		<ImageButton
+		<ImageView
 			android:id="@+id/btn_download"
 			android:layout_width="@dimen/dashListItemHeight"
 			android:layout_height="@dimen/dashListItemHeight"
 			android:layout_gravity="center_vertical"
 			android:background="?attr/dashboard_button"
-			android:src="@drawable/download_button"/>
+			android:scaleType="center"
+			android:src="@drawable/ic_action_import"/>
 	</LinearLayout>
 
 </LinearLayout>

OsmAnd/res/layout/favorites_list_item.xml

@@ -102,7 +102,7 @@
             android:visibility="invisible"
             android:layout_marginLeft="@dimen/dashFavIconMargin"
             android:background="?attr/dashboard_button"
-            android:src="@drawable/ic_action_remove_light" />
+            android:src="@drawable/ic_action_test_light" />
         <ImageButton
             android:id="@+id/options"
             android:layout_width="@dimen/dashListItemHeight"

OsmAnd/res/layout/map_hud_bottom.xml

@@ -47,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="top|center"
                 android:layout_marginTop="3dp"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <TextView
                 android:id="@+id/map_app_mode_text"
@@ -94,7 +94,7 @@
                 android:layout_width="@dimen/map_button_size"
                 android:layout_height="@dimen/map_button_size"
                 android:background="@drawable/btn_round"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:id="@+id/map_route_info_button"
@@ -102,7 +102,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:layout_marginLeft="@dimen/map_button_spacing"
                 android:background="@drawable/btn_round"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
             
             <FrameLayout
                 android:id="@+id/map_ruler_layout"
@@ -143,7 +143,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:layout_gravity="bottom"
                 android:background="@drawable/btn_circle"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -157,7 +157,7 @@
                     android:layout_width="@dimen/map_button_size"
                     android:layout_height="@dimen/map_button_size"
                     android:background="@drawable/btn_circle"
-                    android:src="@drawable/ic_action_remove_light" />
+                    android:src="@drawable/ic_action_test_light" />
 
                 <ImageButton
                     android:id="@+id/map_zoom_out_button"
@@ -165,7 +165,7 @@
                     android:layout_height="@dimen/map_button_size"
                     android:layout_marginTop="@dimen/map_button_spacing"
                     android:background="@drawable/btn_circle"
-                    android:src="@drawable/ic_action_remove_light" />
+                    android:src="@drawable/ic_action_test_light" />
             </LinearLayout>
         </LinearLayout>
     </FrameLayout>
@@ -186,7 +186,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:id="@+id/map_waypoints_route_button"
@@ -194,7 +194,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:id="@+id/map_options_route_button"
@@ -202,7 +202,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <TextView
                 android:id="@+id/map_go_route_button"
@@ -210,7 +210,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_flat"
-                android:drawableLeft="@drawable/ic_action_remove_light"
+                android:drawableLeft="@drawable/ic_action_test_light"
                 android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:paddingLeft="12dp"
@@ -239,14 +239,14 @@
                 android:layout_height="@dimen/map_address_height"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_circle_transparent"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <ImageButton
                 android:layout_width="@dimen/map_address_height"
                 android:layout_height="@dimen/map_address_height"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/btn_circle_transparent"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
         </LinearLayout>
     </FrameLayout>
 

OsmAnd/res/layout/map_hud_top.xml

@@ -43,7 +43,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="@dimen/map_button_margin"
                 android:layout_marginRight="@dimen/map_button_margin"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
 
             <TextView
                 android:id="@+id/waypoint_dist"
@@ -79,7 +79,7 @@
                 android:layout_width="@dimen/map_address_height"
                 android:layout_height="@dimen/map_address_height"
                 android:background="@drawable/btn_circle_transparent"
-                android:src="@drawable/ic_action_remove_light" />
+                android:src="@drawable/ic_action_test_light" />
         </LinearLayout>
     </FrameLayout>
     <!-- Widgets -->
@@ -128,14 +128,14 @@
                         android:layout_width="@dimen/map_button_size"
                         android:layout_height="@dimen/map_button_size"
                         android:background="@drawable/btn_inset_circle"
-                        android:src="@drawable/ic_action_remove_light" />
+                        android:src="@drawable/ic_action_test_light" />
 
                     <ImageButton
                         android:id="@+id/map_compass_button"
                         android:layout_width="@dimen/map_button_size"
                         android:layout_height="@dimen/map_button_size"
                         android:background="@drawable/btn_inset_circle"
-                        android:src="@drawable/ic_action_remove_light" />
+                        android:src="@drawable/ic_action_test_light" />
                 </LinearLayout>
             </LinearLayout>
             <!-- empty block to not let widgets grow more than 40% -->
@@ -230,7 +230,7 @@
                         android:layout_height="@dimen/map_button_size"
                         android:layout_gravity="top|center_horizontal"
                         android:background="@drawable/btn_inset_circle"
-                        android:src="@drawable/ic_action_remove_light" />
+                        android:src="@drawable/ic_action_test_light" />
                 </LinearLayout>
             </FrameLayout>
         </LinearLayout>

OsmAnd/res/layout/map_hud_widget.xml

@@ -24,7 +24,7 @@
             android:layout_width="@dimen/map_widget_image"
             android:layout_height="@dimen/map_widget_image"
             android:layout_gravity="center"
-            android:src="@drawable/ic_action_remove_light"
+            android:src="@drawable/ic_action_test_light"
             android:visibility="gone"
             />
     </FrameLayout>
@@ -40,7 +40,7 @@
             android:layout_height="@dimen/map_widget_icon"
             android:layout_gravity="left|center_vertical"
             android:gravity="center"
-            android:src="@drawable/ic_action_remove_light" />
+            android:src="@drawable/ic_action_test_light" />
 
         <TextView
             android:id="@+id/widget_text"

OsmAnd/res/layout/plan_route_settings.xml

@@ -31,7 +31,7 @@
             android:layout_height="@dimen/dashListItemHeight"
             android:background="@drawable/dashboard_button_light"
             android:scaleType="center"
-            android:src="@drawable/a_10_device_access_volume_muted_dark" />
+            android:src="@drawable/ic_action_volume_off" />
     </LinearLayout>
 
     <LinearLayout

OsmAnd/res/layout/search_history_list_item.xml

@@ -100,7 +100,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/dashFavIconMargin"
             android:background="?attr/dashboard_button"
-            android:src="@drawable/ic_action_remove_light"
+            android:src="@drawable/ic_action_test_light"
             android:visibility="gone" />
     </LinearLayout>
 

OsmAnd/src/net/osmand/plus/ApplicationMode.java

@@ -21,7 +21,7 @@ public class ApplicationMode {
 	 * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian");
 	 */
 	public static final ApplicationMode DEFAULT = create(R.string.app_mode_default, "default").speed(1.5f, 5).arrivalDistance(90).defLocation().
-			icon(R.drawable.ic_browse_map, R.drawable.app_mode_globus_dark).reg();
+			icon(R.drawable.ic_browse_map, R.drawable.ic_world_globe_dark).reg();
 	
 	public static final ApplicationMode CAR = create(R.string.app_mode_car, "car").speed(15.3f, 35).arrivalDistance(90).carLocation().
 			icon(R.drawable.ic_car, R.drawable.ic_action_car_dark).reg();
@@ -33,7 +33,7 @@ public class ApplicationMode {
 			icon(R.drawable.ic_pedestrian, R.drawable.ic_action_pedestrian_dark).reg();
 	
 	public static final ApplicationMode AIRCRAFT = create(R.string.app_mode_aircraft, "aircraft").speed(40f, 100).carLocation().
-			icon(R.drawable.ic_aircraft,R.drawable.ic_action_aircraft_dark).reg();
+			icon(R.drawable.ic_aircraft,R.drawable.ic_action_aircraft).reg();
 	
 	public static final ApplicationMode BOAT = create(R.string.app_mode_boat, "boat").speed(5.5f, 20).carLocation().
 			icon(R.drawable.ic_sail_boat, R.drawable.ic_action_sail_boat_dark).reg();
@@ -148,7 +148,7 @@ public class ApplicationMode {
 	
 	private ApplicationMode parent;
 	private int iconId = R.drawable.ic_browse_map;
-	private int smallIconDark = R.drawable.app_mode_globus_dark ;
+	private int smallIconDark = R.drawable.ic_world_globe_dark ;
 	private float defaultSpeed = 10f;
 	private int minDistanceForTurn = 50;
 	private int arrivalDistance = 90;

OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java

@@ -5,12 +5,10 @@ import java.util.TreeMap;
 import net.osmand.plus.R;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
-import android.graphics.RectF;
 import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -25,9 +23,6 @@ public class FavoriteImageDrawable extends Drawable {
 	private Paint paintOuter;
 	private Drawable drawable;
 	private float density;
-	private Bitmap bmp;
-	private Paint paintBmp;
-	private RectF bmpDest;
 	
 
 	public FavoriteImageDrawable(Context ctx, int color) {
@@ -41,10 +36,6 @@ public class FavoriteImageDrawable extends Drawable {
 		paintOuter = new Paint();
 		paintOuter.setAntiAlias(true);
 		paintOuter.setStyle(Style.FILL_AND_STROKE);
-		paintBmp = new Paint();
-		paintBmp.setAntiAlias(true);
-		paintBmp.setFilterBitmap(true);
-		paintBmp.setDither(true);
 		paintInnerCircle = new Paint();
 		paintInnerCircle.setStyle(Style.FILL_AND_STROKE);
 		paintOuter.setColor(color == 0 || color == Color.BLACK ?   0x88555555 : color );
@@ -95,14 +86,11 @@ public class FavoriteImageDrawable extends Drawable {
 	}
 	
 	public void drawBitmapInCenter(Canvas canvas, int x, int y, float density) {
-		canvas.translate(x, y);
+		int dx = x - getIntrinsicWidth() / 2;
+		int dy = y - getIntrinsicHeight() / 2;
+		canvas.translate(dx, dy);
 		draw(canvas);
-		canvas.translate(-x, -y);
-//		float bmpRad = 10 * density;
-//		bmpDest.set(x - bmpRad, y - bmpRad, x + bmpRad, y + bmpRad);
-//		canvas.drawCircle(x, density + y, bmpRad + 3 * density, paintOuter);
-//		canvas.drawCircle(x, density + y, bmpRad + 2 * density, paintInnerCircle);
-//		canvas.drawBitmap(bmp, null, bmpDest, paintBmp);
+		canvas.translate(-dx, -dy);
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java

@@ -22,6 +22,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -123,9 +124,11 @@ public class DashUpdatesFragment extends DashBaseFragment {
 				public void onClick(View view) {
 					if (getDownloadActivity().isInQueue(item)) {
 						getDownloadActivity().removeFromQueue(item);
-						((ImageButton) view).setImageResource(R.drawable.download_button);
+						((ImageView) view).setImageDrawable(
+								getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_import));
 					} else if (!getDownloadActivity().startDownload(item)) {
-						((ImageButton) view).setImageResource(R.drawable.cancel_button);
+						((ImageView) view).setImageDrawable(
+								getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
 					}
 				}
 			});
@@ -163,7 +166,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			if (!visible) {
 				return;
 			}
-			cancelButton.setImageResource(R.drawable.cancel_button);
+			cancelButton.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
 			View view = (View) cancelButton.getParent();
 			if (view != null && view.findViewById(R.id.map_descr) != null) {
 				view.findViewById(R.id.map_descr).setVisibility(View.GONE);

OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java

@@ -530,9 +530,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 			backToLocationControl.setBg(R.drawable.btn_circle, R.drawable.btn_circle_night);
 			backToLocationControl.setIconColorId(R.color.icon_color_light, 0);
 		} else if (tracked) {
-			// TODO different icon
-			backToLocationControl.setIconColorId(R.color.map_widget_icon_color);
-			backToLocationControl.setBg(R.drawable.btn_circle_blue);
+			backToLocationControl.setBg(R.drawable.btn_circle, R.drawable.btn_circle_night);
+			backToLocationControl.setIconColorId(R.color.color_myloc_distance);
 		} else {
 			backToLocationControl.setIconColorId(0);
 			backToLocationControl.setBg(R.drawable.btn_circle_blue);

OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java

@@ -345,9 +345,9 @@ public class MapRoutePreferencesControl {
 		int t = mute ? R.string.menu_mute_on : R.string.menu_mute_off;
 		int icon;
 		if(mute) {
-			icon = R.drawable.a_10_device_access_volume_muted_dark;
+			icon = R.drawable.ic_action_volume_off;
 		} else{
-			icon = R.drawable.a_10_device_access_volume_on_dark;
+			icon = R.drawable.ic_action_volume_up;
 		}
 		muteBtn.setContentDescription(mapActivity.getString(t));
 		muteBtn.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(icon, R.color.icon_color_light));