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 c4602b6d..cd1e5ddd 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
@@ -81,6 +81,12 @@ public class DataEntryActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        String app_theme = PreferenceManager.getDefaultSharedPreferences(this).getString("app_theme", "Light");
+
+        if (app_theme.equals("Dark")) {
+            setTheme(R.style.AppTheme_Dark);
+        }
+
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_dataentry);
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 830da970..f8a2bec9 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
@@ -185,14 +185,7 @@ public abstract class MeasurementView extends TableLayout {
                 valueView.setGravity(Gravity.RIGHT | Gravity.CENTER);
 
                 if (!isEditable()) {
-                    // if measurement is not editable, darken the icon color
-                    float[] hsv = new float[3];
-                    int color = nameView.getCurrentTextColor();
-                    Color.colorToHSV(color, hsv);
-                    hsv[2] *= 0.4f; // value component
-                    color = Color.HSVToColor(hsv);
-
-                    editModeView.setColorFilter(color);
+                    editModeView.setVisibility(View.GONE);
                 }
 
                 showEvaluatorRow(false);