diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/graph/CustomGraphAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/graph/CustomGraphAdapter.java
index 32a1f6a654..fe7eff5261 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/graph/CustomGraphAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/graph/CustomGraphAdapter.java
@@ -158,6 +158,7 @@ public class CustomGraphAdapter extends BaseGraphAdapter<HorizontalBarChart, Bar
 			Spannable text = getSpanLegend(name, segment, selected);
 			TextView legend = (TextView) view.findViewById(R.id.legend_text);
 			legend.setText(text);
+			AndroidUtils.setTextPrimaryColor(app, legend, isNightMode());
 
 			legendContainer.addView(view);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/RouteStatisticCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/RouteStatisticCard.java
index e25c242469..7b433bc226 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/RouteStatisticCard.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/RouteStatisticCard.java
@@ -79,24 +79,18 @@ public class RouteStatisticCard extends BaseCard {
 		((ImageView) view.findViewById(R.id.time_icon)).setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_time_span));
 
 		int dist = routingHelper.getLeftDistance();
-		int time = routingHelper.getLeftTime();
-		int hours = time / (60 * 60);
-		int minutes = (time / 60) % 60;
-		TextView distanceTv = (TextView) view.findViewById(R.id.distance);
 		String text = OsmAndFormatter.getFormattedDistance(dist, app);
 		SpannableStringBuilder distanceStr = new SpannableStringBuilder(text);
 		int spaceIndex = text.indexOf(" ");
 		if (spaceIndex != -1) {
 			distanceStr.setSpan(new ForegroundColorSpan(getMainFontColor()), 0, spaceIndex, 0);
 		}
+		TextView distanceTv = (TextView) view.findViewById(R.id.distance);
 		distanceTv.setText(distanceStr);
+
+		int time = routingHelper.getLeftTime();
 		SpannableStringBuilder timeStr = new SpannableStringBuilder();
-		if (hours > 0) {
-			timeStr.append(String.valueOf(hours)).append(" ").append(app.getString(R.string.osmand_parking_hour)).append(" ");
-		}
-		if (minutes > 0) {
-			timeStr.append(String.valueOf(minutes)).append(" ").append(app.getString(R.string.osmand_parking_minute));
-		}
+		timeStr.append(OsmAndFormatter.getFormattedDuration(time, app));
 		spaceIndex = timeStr.toString().lastIndexOf(" ");
 		if (spaceIndex != -1) {
 			timeStr.setSpan(new ForegroundColorSpan(getMainFontColor()), 0, spaceIndex, 0);