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 b10f8d3c..9f28aa62 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
@@ -179,8 +179,8 @@ public class DataEntryActivity extends Activity {
                 previousMeasurement = tupleScaleData[0];
                 scaleMeasurement = tupleScaleData[1].clone();
 
-                btnLeft.setVisibility(tupleScaleData[0] != null ? View.VISIBLE : View.INVISIBLE);
-                btnRight.setVisibility(tupleScaleData[2] != null ? View.VISIBLE : View.INVISIBLE);
+                btnLeft.setEnabled(tupleScaleData[0] != null);
+                btnRight.setEnabled(tupleScaleData[2] != null);
             }
         } else {
             setViewMode(MeasurementView.MeasurementViewMode.ADD);
@@ -217,10 +217,8 @@ public class DataEntryActivity extends Activity {
                 btnOk.setVisibility(View.VISIBLE);
                 btnAdd.setVisibility(View.GONE);
                 imageViewDelete.setVisibility(View.VISIBLE);
-                if (scaleMeasurement == null) {
-                    btnLeft.setVisibility(View.VISIBLE);
-                    btnRight.setVisibility(View.VISIBLE);
-                }
+                btnLeft.setVisibility(View.VISIBLE);
+                btnRight.setVisibility(View.VISIBLE);
                 expandButton.setVisibility(View.VISIBLE);
                 switchEditMode.setVisibility(View.VISIBLE);
                 dateTimeVisibility = View.GONE;
@@ -229,10 +227,8 @@ public class DataEntryActivity extends Activity {
                 btnOk.setVisibility(View.VISIBLE);
                 btnAdd.setVisibility(View.GONE);
                 imageViewDelete.setVisibility(View.VISIBLE);
-                if (scaleMeasurement == null) {
-                    btnLeft.setVisibility(View.VISIBLE);
-                    btnRight.setVisibility(View.VISIBLE);
-                }
+                btnLeft.setVisibility(View.VISIBLE);
+                btnRight.setVisibility(View.VISIBLE);
                 expandButton.setVisibility(View.VISIBLE);
                 switchEditMode.setVisibility(View.VISIBLE);
                 break;
diff --git a/android_app/app/src/main/res/drawable/flat_selector.xml b/android_app/app/src/main/res/drawable/flat_selector.xml
index 6e9fe6c4..224c8210 100644
--- a/android_app/app/src/main/res/drawable/flat_selector.xml
+++ b/android_app/app/src/main/res/drawable/flat_selector.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
     <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/rect_pressed"/>
+    <item android:state_enabled="false" android:drawable="@drawable/rect_disabled" />
     <item android:drawable="@drawable/rect_normal"/>
     </selector>
diff --git a/android_app/app/src/main/res/drawable/rect_disabled.xml b/android_app/app/src/main/res/drawable/rect_disabled.xml
new file mode 100644
index 00000000..61026260
--- /dev/null
+++ b/android_app/app/src/main/res/drawable/rect_disabled.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/corner_radius" />
+    <solid android:color="@color/gray_disabled" />
+</shape>
diff --git a/android_app/app/src/main/res/drawable/rect_normal.xml b/android_app/app/src/main/res/drawable/rect_normal.xml
index c5c3b997..ef63741a 100644
--- a/android_app/app/src/main/res/drawable/rect_normal.xml
+++ b/android_app/app/src/main/res/drawable/rect_normal.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/rect_pressed" />
-
     <item android:bottom="@dimen/layer_padding">
-    <shape android:shape="rectangle">
-    <corners android:radius="@dimen/corner_radius" />
-    <solid android:color="@color/blue_normal" />
-    </shape>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/corner_radius" />
+            <solid android:color="@color/blue_normal" />
+        </shape>
     </item>
-    </layer-list>
+</layer-list>
diff --git a/android_app/app/src/main/res/drawable/rect_pressed.xml b/android_app/app/src/main/res/drawable/rect_pressed.xml
index 2cc15774..9fe914a3 100644
--- a/android_app/app/src/main/res/drawable/rect_pressed.xml
+++ b/android_app/app/src/main/res/drawable/rect_pressed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <shape xmlns:android="http://schemas.android.com/apk/res/android"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/corner_radius" />
     <solid android:color="@color/blue_pressed" />
-    </shape>
+</shape>
diff --git a/android_app/app/src/main/res/values/colors.xml b/android_app/app/src/main/res/values/colors.xml
index 243b10a2..98c6296e 100644
--- a/android_app/app/src/main/res/values/colors.xml
+++ b/android_app/app/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <resources>
+<resources>
     <color name="blue_pressed">@android:color/holo_blue_dark</color>
     <color name="blue_normal">@android:color/holo_blue_light</color>
-  </resources>
+    <color name="gray_disabled">#ccc</color>
+</resources>