diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index 09f11c0ff2..1b41867d16 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -90,6 +90,7 @@
                         android:id="@+id/age"
                         android:layout_width="130dp"
                         android:layout_height="40dp"
+                        android:layout_marginBottom="2dp"
                         app:customContentDescription="@string/age" />
 
                 </TableRow>
@@ -112,6 +113,7 @@
                         android:id="@+id/tdd"
                         android:layout_width="130dp"
                         android:layout_height="40dp"
+                        android:layout_marginBottom="2dp"
                         app:customContentDescription="@string/tdd_total" />
 
                 </TableRow>
@@ -134,6 +136,7 @@
                         android:id="@+id/weight"
                         android:layout_width="130dp"
                         android:layout_height="40dp"
+                        android:layout_marginBottom="2dp"
                         app:customContentDescription="@string/weight_label" />
 
                 </TableRow>
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 00028bf5ba..0455f7c3ae 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -109,7 +109,7 @@
                     <CheckBox
                         android:id="@+id/alarmCheckBox"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="40dp"
                         android:layout_gravity="center_vertical"
                         android:checked="false"
                         android:padding="2dp"
@@ -119,21 +119,22 @@
 
                 </LinearLayout>
 
-                    <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
-                        android:id="@+id/time"
-                        android:layout_width="130dp"
-                        android:layout_height="40dp"
-                        app:customContentDescription="@string/time_offset" />
+                <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
+                    android:id="@+id/time"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_marginBottom="2dp"
+                    app:customContentDescription="@string/time_offset" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="start"
-                        android:paddingStart="5dp"
-                        android:paddingEnd="5dp"
-                        android:text="@string/unit_minute_short"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
+                    android:text="@string/unit_minute_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
             </TableRow>
 
@@ -158,6 +159,7 @@
                     android:layout_width="130dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="2dp"
                     app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index 78682fb289..1ea7d894a7 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -100,6 +100,7 @@
                 android:id="@+id/bg"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
+                android:layout_marginBottom="2dp"
                 app:customContentDescription="@string/treatments_wizard_bg_label" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index fa2928e4c9..641b884bf1 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -67,6 +67,7 @@
                 android:id="@+id/insulin"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
+                android:layout_marginBottom="2dp"
                 app:customContentDescription="@string/overview_insulin_label" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index 3c7cf2f561..536d530ca8 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -90,7 +90,8 @@
                 android:id="@+id/time"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                app:customContentDescription="@string/time_offset"/>
+                android:layout_marginBottom="2dp"
+                app:customContentDescription="@string/time_offset" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 48d2b45161..7a24040bd5 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -111,7 +111,8 @@
                 android:id="@+id/duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                app:customContentDescription="@string/careportal_newnstreatment_duration_label"/>
+                android:layout_marginBottom="2dp"
+                app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -147,7 +148,8 @@
                 android:id="@+id/percentage"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                app:customContentDescription="@string/careportal_newnstreatment_percentage_label"/>
+                android:layout_marginBottom="2dp"
+                app:customContentDescription="@string/careportal_newnstreatment_percentage_label" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index 2f87023a71..e7a3820545 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -68,6 +68,7 @@
                 android:id="@+id/basal_percent_input"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
+                android:layout_marginBottom="2dp"
                 app:customContentDescription="@string/basal_rate" />
 
             <TextView
@@ -104,6 +105,7 @@
                 android:id="@+id/basal_absolute_input"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
+                android:layout_marginBottom="2dp"
                 app:customContentDescription="@string/basal_rate" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 05bbf92ade..8906188173 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -68,7 +68,7 @@
                 android:id="@+id/temptarget"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
+                android:layout_marginBottom="2dp"
                 app:customContentDescription="@string/target_label" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index 0688026983..e087f99dd3 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -20,7 +20,8 @@
             android:layout_gravity="center"
             android:background="?attr/dialogTitleBackground"
             android:orientation="horizontal"
-            android:padding="5dp">
+            android:padding="5dp"
+            android:layout_marginBottom="5dp">
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -53,7 +54,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="5dp"
-                android:text="@string/do_not_bolus_record_only" />
+                android:text="@string/do_not_bolus_record_only"
+                tools:visibility="gone"/>
 
         </LinearLayout>
 
@@ -77,6 +79,7 @@
                 android:id="@+id/insulin"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
+                android:layout_marginBottom="2dp"
                 app:customContentDescription="@string/overview_insulin_label" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 7f7585a37f..4584b4d647 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -72,6 +72,7 @@
                     android:id="@+id/bg_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
+                    android:layout_marginBottom="2dp"
                     app:customContentDescription="@string/a11y_current_bg" />
 
                 <TextView
@@ -106,6 +107,7 @@
                     android:layout_width="130dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="2dp"
                     app:customContentDescription="@string/treatments_wizard_carbs_label" />
 
                 <TextView
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
index 8940462136..c8f9888ec6 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
@@ -2,8 +2,6 @@ package info.nightscout.androidaps.activities
 
 import android.content.Context
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.locale.LocaleHelper