diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
index a32d055d31..08109bbb64 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
@@ -116,7 +116,7 @@ public class DanaRUserOptionsActivity extends Activity {
                     screenTimeout.setStep(5d);
                     screenTimeout.setParams(5d,5d,240d,5d,new DecimalFormat("1"), false);
                     backlightTimeout.setValue((double) pump.backlightOnTimeSec);
-                    backlightTimeout.setParams(0d,0d,60d,1d,new DecimalFormat("1"), false);
+                    backlightTimeout.setParams(1d,1d,60d,1d,new DecimalFormat("1"), false);
                     if(pump.lastSettingsRead == 0)
                         log.debug("No settings loaded from pump!");
                     if (pump.getUnits() != null) {
diff --git a/app/src/main/res/drawable-hdpi/icon_danar-useropthdpi.png b/app/src/main/res/drawable-hdpi/icon_danar-useropthdpi.png
deleted file mode 100644
index ee3ab7725e..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_danar-useropthdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_danar-useroptmdpi.png b/app/src/main/res/drawable-mdpi/icon_danar-useroptmdpi.png
deleted file mode 100644
index 1fadcd446b..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_danar-useroptmdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_danar-useroptxhdpi.png b/app/src/main/res/drawable-xhdpi/icon_danar-useroptxhdpi.png
deleted file mode 100644
index 126122a570..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_danar-useroptxhdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_danar-useroptxxhdpi.png b/app/src/main/res/drawable-xxhdpi/icon_danar-useroptxxhdpi.png
deleted file mode 100644
index b2a8eb9313..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_danar-useroptxxhdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_danar-useroptxxxhdpi.png b/app/src/main/res/drawable-xxxhdpi/icon_danar-useroptxxxhdpi.png
deleted file mode 100644
index 52f952ced4..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_danar-useroptxxxhdpi.png and /dev/null differ
diff --git a/app/src/main/res/layout/danar_fragment.xml b/app/src/main/res/layout/danar_fragment.xml
index 2f0cb992d6..6c9578cd68 100644
--- a/app/src/main/res/layout/danar_fragment.xml
+++ b/app/src/main/res/layout/danar_fragment.xml
@@ -736,7 +736,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarstats"
+                    android:drawableTop="@drawable/icon_danar_useropt"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/danar_useroptions" />
diff --git a/app/src/main/res/layout/danar_user_options.xml b/app/src/main/res/layout/danar_user_options.xml
index 6cc9ae609c..33388f3171 100644
--- a/app/src/main/res/layout/danar_user_options.xml
+++ b/app/src/main/res/layout/danar_user_options.xml
@@ -218,6 +218,7 @@
                     android:layout_marginRight="5dp"
                     android:layout_marginStart="20dp"
                     android:layout_marginTop="5dp"
+                    android:gravity="center"
                     android:orientation="horizontal">
 
                     <TextView
@@ -229,16 +230,6 @@
                         android:text="@string/danar_screentimeout"
                         android:textSize="14sp" />
 
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
                     <info.nightscout.utils.NumberPicker
                         android:id="@+id/danar_screentimeout"
                         android:layout_width="wrap_content"
@@ -267,6 +258,7 @@
                     android:layout_marginRight="5dp"
                     android:layout_marginStart="20dp"
                     android:layout_marginTop="5dp"
+                    android:gravity="center"
                     android:orientation="horizontal">
 
                     <TextView
@@ -278,16 +270,6 @@
                         android:text="@string/danar_backlight"
                         android:textSize="14sp" />
 
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
                     <info.nightscout.utils.NumberPicker
                         android:id="@+id/danar_backlight"
                         android:layout_width="wrap_content"
@@ -349,6 +331,7 @@
                     android:layout_marginRight="5dp"
                     android:layout_marginStart="20dp"
                     android:layout_marginTop="5dp"
+                    android:gravity="center"
                     android:orientation="horizontal">
 
                     <TextView
@@ -360,15 +343,7 @@
                         android:text="@string/danar_shutdown"
                         android:textSize="14sp" />
 
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
+
 
                     <info.nightscout.utils.NumberPicker
                         android:id="@+id/danar_shutdown"
@@ -398,6 +373,7 @@
                     android:layout_marginRight="5dp"
                     android:layout_marginStart="20dp"
                     android:layout_marginTop="5dp"
+                    android:gravity="center"
                     android:orientation="horizontal">
 
                     <TextView
@@ -409,16 +385,6 @@
                         android:text="@string/danar_lowreservoir"
                         android:textSize="14sp" />
 
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
                     <info.nightscout.utils.NumberPicker
                         android:id="@+id/danar_lowreservoir"
                         android:layout_width="wrap_content"