Fix icons and layouts

OsmAnd/res/layout/layers_list_activity_item.xml

@@ -4,15 +4,16 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:layout_marginTop="2dip"
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip"
-    android:weightSum="1" android:background="@color/color_white">
+    android:background="@color/color_white">
 
     <TextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dip"
+    	android:layout_marginBottom="4dip"
         android:gravity="center_vertical"
         android:text="@string/layer_poi"
         android:textAppearance="?android:attr/textAppearanceMedium"

OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java

@@ -1030,9 +1030,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 				}
 			};
 			if(ri.rec.isPhoto()) {
-				adapter.registerItem(R.string.recording_context_menu_show, R.drawable.list_context_menu_play, listener, 0);
+				adapter.registerItem(R.string.recording_context_menu_show, R.drawable.list_activities_play_note, listener, 0);
 			} else {
-				adapter.registerItem(R.string.recording_context_menu_play, R.drawable.list_context_menu_play, listener, 0);
+				adapter.registerItem(R.string.recording_context_menu_play, R.drawable.list_activities_play_note, listener, 0);
 			}
 			adapter.registerItem(R.string.show_location, 0, new OnContextMenuClick() {
 				@Override

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

@@ -538,14 +538,13 @@ public class MapInfoLayer extends OsmandMapLayer {
 						tv.setText(s +map.getString(mi.messageId) +s);
 					}
 					// Put the image on the TextView
-					// FIXME!!
-//					if (mi.drawable != 0) {
-//						tv.setPadding((int) (12 *scaleCoefficient), 0, 0, 0);
-//						tv.setCompoundDrawablesWithIntrinsicBounds(mi.drawable, 0, 0, 0);
-//					} else {
+					if (mi.drawable != 0) {
+						tv.setPadding((int) (12 *scaleCoefficient), 0, 0, 0);
+						tv.setCompoundDrawablesWithIntrinsicBounds(mi.drawable, 0, 0, 0);
+					} else {
 						tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
 						tv.setPadding((int) (30 *scaleCoefficient), 0, 0, 0);
-//					}
+					}
 					final boolean selecteable = mi.selecteable();
 					ch.setOnCheckedChangeListener(null);
 					if(!mi.selecteable()) {

OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java

@@ -217,8 +217,8 @@ public class RouteInfoWidgetsFactory {
 	
 	public TextInfoWidget createTimeControl(final MapActivity map, Paint paintText, Paint paintSubText){
 		final RoutingHelper routingHelper = map.getRoutingHelper();
-		final Drawable time = map.getResources().getDrawable(R.drawable.info_time);
-		final Drawable timeToGo = map.getResources().getDrawable(R.drawable.info_time_to_go);
+		final Drawable time = map.getResources().getDrawable(R.drawable.widget_time);
+		final Drawable timeToGo = map.getResources().getDrawable(R.drawable.widget_time_to_distance);
 		final OsmandApplication ctx = map.getMyApplication();
 		final OsmandPreference<Boolean> showArrival = ctx.getSettings().SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME;
 		final TextInfoWidget leftTimeControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
@@ -280,6 +280,7 @@ public class RouteInfoWidgetsFactory {
 	}
 	
 	
+	
 	public TextInfoWidget createMaxSpeedControl(final MapActivity map, Paint paintText, Paint paintSubText) {
 		final RoutingHelper rh = map.getMyApplication().getRoutingHelper();
 		final OsmAndLocationProvider locationProvider = map.getMyApplication().getLocationProvider();
@@ -318,7 +319,7 @@ public class RouteInfoWidgetsFactory {
 				return false;
 			}
 		};
-		speedControl.setImageDrawable(map.getResources().getDrawable(R.drawable.info_max_speed));
+		speedControl.setImageDrawable(map.getResources().getDrawable(R.drawable.widget_max_speed));
 		speedControl.setText(null, null);
 		return speedControl;
 	}
@@ -362,7 +363,7 @@ public class RouteInfoWidgetsFactory {
 				return false;
 			}
 		};
-		speedControl.setImageDrawable(app.getResources().getDrawable(R.drawable.info_speed));
+		speedControl.setImageDrawable(map.getResources().getDrawable(R.drawable.widget_speed));
 		speedControl.setText(null, null);
 		return speedControl;
 	}
@@ -435,7 +436,7 @@ public class RouteInfoWidgetsFactory {
 	public TextInfoWidget createDistanceControl(final MapActivity map, Paint paintText, Paint paintSubText) {
 		final OsmandMapTileView view = map.getMapView();
 		DistanceToPointInfoControl distanceControl = new DistanceToPointInfoControl(map, 0, paintText, paintSubText, map.getResources()
-				.getDrawable(R.drawable.info_target), view) {
+				.getDrawable(R.drawable.widget_target), view) {
 			@Override
 			public LatLon getPointToNavigate() {
 				return map.getPointToNavigate();
@@ -456,7 +457,7 @@ public class RouteInfoWidgetsFactory {
 		final OsmandMapTileView view = map.getMapView();
 		final TargetPointsHelper targets = map.getMyApplication().getTargetPointsHelper();
 		DistanceToPointInfoControl distanceControl = new DistanceToPointInfoControl(map, 0, paintText, paintSubText, map.getResources()
-				.getDrawable(R.drawable.info_intermediate), view) {
+				.getDrawable(R.drawable.widget_intermediate), view) {
 
 			@Override
 			protected void click(OsmandMapTileView view) {