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 be2ca725..e1cd84cd 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
@@ -73,7 +73,9 @@ public class DataEntryActivity extends AppCompatActivity {
     private Button btnLeft;
     private Button btnRight;
 
-    private MenuItem saveButton;
+    private Button btnCancel;
+    private Button btnSave;
+
     private MenuItem editButton;
     private MenuItem expandButton;
     private MenuItem deleteButton;
@@ -128,6 +130,29 @@ public class DataEntryActivity extends AppCompatActivity {
         btnLeft = (Button) findViewById(R.id.btnLeft);
         btnRight = (Button) findViewById(R.id.btnRight);
 
+        btnCancel = (Button) findViewById(R.id.btnCancel);
+        btnSave = (Button) findViewById(R.id.btnSave);
+
+        btnCancel.setOnClickListener(new Button.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+        });
+        btnSave.setOnClickListener(new Button.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final boolean isEdit = scaleMeasurement.getId() > 0;
+                saveScaleData();
+                if (isEdit) {
+                    setViewMode(MeasurementView.MeasurementViewMode.VIEW);
+                }
+                else {
+                    finish();
+                }
+            }
+        });
+
         btnLeft.setVisibility(View.INVISIBLE);
         btnRight.setVisibility(View.INVISIBLE);
 
@@ -193,7 +218,6 @@ public class DataEntryActivity extends AppCompatActivity {
             item.setIcon(wrapped);
         }
 
-        saveButton = menu.findItem(R.id.saveButton);
         editButton = menu.findItem(R.id.editButton);
         expandButton = menu.findItem(R.id.expandButton);
         deleteButton = menu.findItem(R.id.deleteButton);
@@ -212,17 +236,6 @@ public class DataEntryActivity extends AppCompatActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.saveButton:
-                final boolean isEdit = scaleMeasurement.getId() > 0;
-                saveScaleData();
-                if (isEdit) {
-                    setViewMode(MeasurementView.MeasurementViewMode.VIEW);
-                }
-                else {
-                    finish();
-                }
-                return true;
-
             case R.id.expandButton:
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                 final boolean expand = !prefs.getBoolean(PREF_EXPAND, true);
@@ -324,35 +337,39 @@ public class DataEntryActivity extends AppCompatActivity {
 
         switch (viewMode) {
             case VIEW:
-                saveButton.setVisible(false);
                 editButton.setVisible(true);
                 expandButton.setVisible(true);
                 deleteButton.setVisible(true);
 
+                btnCancel.setVisibility(View.GONE);
+                btnSave.setVisibility(View.GONE);
+
                 btnLeft.setVisibility(View.VISIBLE);
                 btnRight.setVisibility(View.VISIBLE);
 
                 dateTimeVisibility = View.GONE;
                 break;
             case EDIT:
-                saveButton.setVisible(true);
-                saveButton.setTitle(R.string.save);
-
                 editButton.setVisible(false);
                 expandButton.setVisible(true);
                 deleteButton.setVisible(true);
 
+                btnCancel.setVisibility(View.VISIBLE);
+                btnSave.setVisibility(View.VISIBLE);
+                btnSave.setText(R.string.label_ok);
+
                 btnLeft.setVisibility(View.GONE);
                 btnRight.setVisibility(View.GONE);
                 break;
             case ADD:
-                saveButton.setVisible(true);
-                saveButton.setTitle(R.string.label_add);
-
                 editButton.setVisible(false);
                 expandButton.setVisible(false);
                 deleteButton.setVisible(false);
 
+                btnCancel.setVisibility(View.VISIBLE);
+                btnSave.setVisibility(View.VISIBLE);
+                btnSave.setText(R.string.label_add);
+
                 btnLeft.setVisibility(View.GONE);
                 btnRight.setVisibility(View.GONE);
                 break;
diff --git a/android_app/app/src/main/res/layout/activity_dataentry.xml b/android_app/app/src/main/res/layout/activity_dataentry.xml
index 62e0faeb..b935682c 100644
--- a/android_app/app/src/main/res/layout/activity_dataentry.xml
+++ b/android_app/app/src/main/res/layout/activity_dataentry.xml
@@ -68,5 +68,33 @@
 
     </ScrollView>
 
-</LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="5dp">
 
+        <Button
+            android:id="@+id/btnCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:background="@drawable/flat_selector"
+            android:text="@string/label_cancel"
+            android:textColor="@android:color/white" />
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.5" />
+
+        <Button
+            android:id="@+id/btnSave"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:background="@drawable/flat_selector"
+            android:text="@string/label_add"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/android_app/app/src/main/res/menu/dataentry_menu.xml b/android_app/app/src/main/res/menu/dataentry_menu.xml
index ff30099e..3970b40b 100644
--- a/android_app/app/src/main/res/menu/dataentry_menu.xml
+++ b/android_app/app/src/main/res/menu/dataentry_menu.xml
@@ -2,10 +2,6 @@
 <menu xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/saveButton"
-        android:title="@string/save"
-        app:showAsAction="always|withText" />
     <item
         android:id="@+id/editButton"
         android:title="@string/edit"
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index d4ca103f..8b060abd 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -214,6 +214,5 @@
     <string name="customactivityoncrash_error_activity_error_details_clipboard_label">Error information</string>
     <string name="toggle_expand">Toggle expand</string>
     <string name="edit">Edit</string>
-    <string name="save">Save</string>
 
 </resources>