diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
index 9ebbc7e9..7f1a4ccb 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
@@ -35,6 +35,7 @@ import android.widget.Toast;
 import com.health.openscale.R;
 import com.health.openscale.core.OpenScale;
 import com.health.openscale.core.datatypes.ScaleData;
+import com.health.openscale.gui.views.BMIMeasurementView;
 import com.health.openscale.gui.views.CommentMeasurementView;
 import com.health.openscale.gui.views.DateMeasurementView;
 import com.health.openscale.gui.views.FatMeasurementView;
@@ -42,6 +43,8 @@ import com.health.openscale.gui.views.HipMeasurementView;
 import com.health.openscale.gui.views.MeasurementView;
 import com.health.openscale.gui.views.MuscleMeasurementView;
 import com.health.openscale.gui.views.TimeMeasurementView;
+import com.health.openscale.gui.views.WHRMeasurementView;
+import com.health.openscale.gui.views.WHtRMeasurementView;
 import com.health.openscale.gui.views.WaistMeasurementView;
 import com.health.openscale.gui.views.WaterMeasurementView;
 import com.health.openscale.gui.views.WeightMeasurementView;
@@ -60,11 +63,14 @@ public class DataEntryActivity extends Activity {
     private TableLayout tableLayoutDataEntry;
 
     private WeightMeasurementView weightMeasurement;
+    private BMIMeasurementView bmiMeasurementView;
     private WaterMeasurementView waterMeasurement;
     private MuscleMeasurementView muscleMeasurement;
     private FatMeasurementView fatMeasurement;
     private WaistMeasurementView waistMeasurement;
+    private WHtRMeasurementView wHtRMeasurementView;
     private HipMeasurementView hipMeasurement;
+    private WHRMeasurementView whrMeasurementView;
     private CommentMeasurementView commentMeasurement;
     private DateMeasurementView dateMeasurement;
     private TimeMeasurementView timeMeasurement;
@@ -95,22 +101,28 @@ public class DataEntryActivity extends Activity {
         tableLayoutDataEntry = (TableLayout) findViewById(R.id.tableLayoutDataEntry);
 
         weightMeasurement = new WeightMeasurementView(context);
+        bmiMeasurementView = new BMIMeasurementView(context);
         waterMeasurement = new WaterMeasurementView(context);
         muscleMeasurement = new MuscleMeasurementView(context);
         fatMeasurement = new FatMeasurementView(context);
         waistMeasurement = new WaistMeasurementView(context);
+        wHtRMeasurementView = new WHtRMeasurementView(context);
         hipMeasurement = new HipMeasurementView(context);
+        whrMeasurementView = new WHRMeasurementView(context);
         commentMeasurement = new CommentMeasurementView(context);
         dateMeasurement = new DateMeasurementView(context);
         timeMeasurement = new TimeMeasurementView(context);
 
         dataEntryMeasurements = new ArrayList<>();
         dataEntryMeasurements.add(weightMeasurement);
+        dataEntryMeasurements.add(bmiMeasurementView);
         dataEntryMeasurements.add(waterMeasurement);
         dataEntryMeasurements.add(muscleMeasurement);
         dataEntryMeasurements.add(fatMeasurement);
         dataEntryMeasurements.add(waistMeasurement);
+        dataEntryMeasurements.add(wHtRMeasurementView);
         dataEntryMeasurements.add(hipMeasurement);
+        dataEntryMeasurements.add(whrMeasurementView);
         dataEntryMeasurements.add(commentMeasurement);
         dataEntryMeasurements.add(dateMeasurement);
         dataEntryMeasurements.add(timeMeasurement);
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
index ea6bb081..4feb97e2 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
@@ -114,7 +114,7 @@ public abstract class MeasurementView extends TableLayout {
 
         editModeView.getLayoutParams().height = pxImageDp(20);
         editModeView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
-        editModeView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.edit));
+        editModeView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.editable));
         editModeView.setVisibility(View.GONE);
 
         indicatorView.setLayoutParams(new TableRow.LayoutParams(0, LayoutParams.MATCH_PARENT, 0.01f));
@@ -167,9 +167,12 @@ public abstract class MeasurementView extends TableLayout {
                 break;
             case EDIT:
             case ADD:
-                if (isEditable()) {
-                    editModeView.setVisibility(View.VISIBLE);
+                editModeView.setVisibility(View.VISIBLE);
+
+                if (!isEditable()) {
+                    editModeView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.noteditable));
                 }
+
                 indicatorView.setVisibility(View.GONE);
                 evaluatorRow.setVisibility(View.GONE);
                 break;
diff --git a/android_app/app/src/main/res/drawable/delete.png b/android_app/app/src/main/res/drawable/delete.png
new file mode 100644
index 00000000..b3753f3a
Binary files /dev/null and b/android_app/app/src/main/res/drawable/delete.png differ
diff --git a/android_app/app/src/main/res/drawable/editable.png b/android_app/app/src/main/res/drawable/editable.png
new file mode 100644
index 00000000..017d8532
Binary files /dev/null and b/android_app/app/src/main/res/drawable/editable.png differ
diff --git a/android_app/app/src/main/res/drawable/noteditable.png b/android_app/app/src/main/res/drawable/noteditable.png
new file mode 100644
index 00000000..08fb005a
Binary files /dev/null and b/android_app/app/src/main/res/drawable/noteditable.png differ
diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index bd430235..a89ac6b6 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -116,4 +116,5 @@
     <string name="Sunday">Sonntag</string>
     <string name="error_value_range">Fehler beim Wertebereich</string>
     <string name="error_value_required">Wert ist erforderlich</string>
+    <string name="label_editmode">Bearbeiten</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values-fr/strings.xml b/android_app/app/src/main/res/values-fr/strings.xml
index ed541ca2..f4a709a3 100644
--- a/android_app/app/src/main/res/values-fr/strings.xml
+++ b/android_app/app/src/main/res/values-fr/strings.xml
@@ -135,4 +135,5 @@
     <string name="Friday">Vendredi</string>
     <string name="Saturday">Samedi</string>
     <string name="Sunday">Dimanche</string>
+    <string name="label_editmode">Modifier</string>
 </resources>
diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml
index e773f2d5..0c7c8ab2 100644
--- a/android_app/app/src/main/res/values-ja/strings.xml
+++ b/android_app/app/src/main/res/values-ja/strings.xml
@@ -116,4 +116,5 @@
     <string name="Sunday">日曜日</string>
     <string name="error_value_required">値が必要です</string>
     <string name="error_value_range">エラー値の範囲</string>
+    <string name="label_editmode">編集</string>
 </resources>
\ No newline at end of file