diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
index 75a3c13e7..60c6dfa0f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
@@ -565,23 +565,19 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
 
     protected LineDataSet createHeartrateSet(List<Entry> values, String label) {
         LineDataSet set1 = new LineDataSet(values, label);
+        set1.setLineWidth(0.8f);
         set1.setColor(HEARTRATE_COLOR);
-//        set1.setColors(colors);
         set1.setDrawCubic(true);
         set1.setCubicIntensity(0.1f);
-//        //set1.setDrawFilled(true);
-//        set1.setDrawCircles(false);
-//        set1.setLineWidth(2f);
-
         set1.setDrawCircles(false);
 //        set1.setCircleRadius(2f);
 //        set1.setDrawFilled(true);
-
-        set1.setLineWidth(0.8f);
+//        set1.setColor(getResources().getColor(android.R.color.background_light));
+//        set1.setCircleColor(HEARTRATE_COLOR);
 //        set1.setFillColor(ColorTemplate.getHoloBlue());
-        set1.setDrawValues(true);
 //        set1.setHighLightColor(Color.rgb(128, 0, 255));
 //        set1.setColor(Color.rgb(89, 178, 44));
+        set1.setDrawValues(true);
         set1.setValueTextColor(CHART_TEXT_COLOR);
         set1.setAxisDependency(YAxis.AxisDependency.RIGHT);
         return set1;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
index cd014362e..ef1dcd072 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
@@ -445,13 +445,7 @@ public class LiveActivityFragment extends AbstractChartFragment {
         mHistorySet.setDrawFilled(true);
         mHistorySet.setDrawValues(false);
 
-        mHeartRateSet = new LineDataSet(new ArrayList<Entry>(), getString(R.string.live_activity_heart_rate));
-        mHeartRateSet.setAxisDependency(YAxis.AxisDependency.RIGHT);
-        mHeartRateSet.setColor(HEARTRATE_COLOR);
-        mHeartRateSet.setDrawCircles(false);
-        mHeartRateSet.setDrawCubic(true);
-        mHeartRateSet.setDrawFilled(false);
-//        mHeartRateSet.setFillColor(HEARTRATE_FILL_COLOR);
+        mHeartRateSet = createHeartrateSet(new ArrayList<Entry>(), getString(R.string.live_activity_heart_rate));
         mHeartRateSet.setDrawValues(false);
     }