From 18cf4b14c82103cb1698ae3c4c898a774e7fbbfc Mon Sep 17 00:00:00 2001
From: Andries Smit <mr.andries.smit@gmail.com>
Date: Thu, 24 Mar 2022 12:15:56 +0100
Subject: [PATCH] chore: move dialog and header style to theme

---
 .../androidaps/dialogs/CalibrationDialog.kt   |  1 +
 .../androidaps/dialogs/CarbsDialog.kt         |  1 +
 .../androidaps/dialogs/CareDialog.kt          |  1 +
 .../androidaps/dialogs/ExtendedBolusDialog.kt |  1 +
 .../androidaps/dialogs/FillDialog.kt          |  1 +
 .../androidaps/dialogs/InsulinDialog.kt       |  1 +
 .../androidaps/dialogs/ProfileSwitchDialog.kt |  1 +
 .../androidaps/dialogs/TempBasalDialog.kt     |  1 +
 .../androidaps/dialogs/TempTargetDialog.kt    |  1 +
 .../androidaps/dialogs/TreatmentDialog.kt     |  1 +
 .../androidaps/dialogs/WizardDialog.kt        |  9 ---
 .../main/res/layout/dialog_calibration.xml    | 10 +---
 app/src/main/res/layout/dialog_carbs.xml      |  9 +--
 app/src/main/res/layout/dialog_care.xml       | 10 ++--
 .../main/res/layout/dialog_extendedbolus.xml  |  9 +--
 app/src/main/res/layout/dialog_fill.xml       |  9 +--
 app/src/main/res/layout/dialog_insulin.xml    |  9 +--
 app/src/main/res/layout/dialog_loop.xml       |  9 +--
 .../main/res/layout/dialog_profileswitch.xml  |  9 +--
 app/src/main/res/layout/dialog_tempbasal.xml  |  9 +--
 app/src/main/res/layout/dialog_temptarget.xml |  9 +--
 app/src/main/res/layout/dialog_treatment.xml  | 10 +---
 app/src/main/res/layout/dialog_wizard.xml     |  9 +--
 app/src/main/res/layout/dialog_wizardinfo.xml |  9 +--
 .../overview_editquickwizard_dialog.xml       |  7 +--
 .../dialogs/ChooseOperationDialog.kt          |  2 +
 .../res/layout/automation_dialog_action.xml   |  9 +--
 .../automation_dialog_choose_action.xml       | 10 ++--
 .../automation_dialog_choose_operation.xml    |  9 +--
 .../automation_dialog_choose_trigger.xml      |  9 +--
 .../layout/automation_dialog_edit_trigger.xml |  9 +--
 .../res/layout/automation_dialog_event.xml    |  9 +--
 .../androidaps/dialogs/BolusProgressDialog.kt | 16 -----
 .../dialogs/DialogFragmentWithDate.kt         | 11 ----
 core/src/main/res/drawable-hdpi/dialog.xml    | 33 ++++------
 .../main/res/drawable-hdpi/dialog_header.xml  | 12 ++++
 .../drawable/ic_trending_flat_white_48dp.xml  | 13 ++--
 .../main/res/layout/dialog_alert_custom.xml   | 10 ++--
 .../main/res/layout/dialog_bolusprogress.xml  |  8 +--
 core/src/main/res/layout/dialog_error.xml     |  8 +--
 .../main/res/layout/dialog_profileviewer.xml  |  9 +--
 core/src/main/res/values-night/styles.xml     |  1 -
 core/src/main/res/values/attrs.xml            |  2 -
 core/src/main/res/values/colors.xml           |  2 +-
 core/src/main/res/values/styles.xml           | 14 ++++-
 .../layout/danars_pairing_progress_dialog.xml | 60 +++++++++----------
 46 files changed, 164 insertions(+), 238 deletions(-)
 create mode 100644 core/src/main/res/drawable-hdpi/dialog_header.xml

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
index 20a0de18de..bd5daaf965 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
@@ -27,6 +27,7 @@ import javax.inject.Inject
 class CalibrationDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var xDripBroadcast: XDripBroadcast
     @Inject lateinit var uel: UserEntryLogger
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index ce39706342..ff4f64e0f4 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -41,6 +41,7 @@ import kotlin.math.max
 class CarbsDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var ctx: Context
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index d466956251..03cb215a7f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -41,6 +41,7 @@ class CareDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var ctx: Context
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var translator: Translator
     @Inject lateinit var uel: UserEntryLogger
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
index 0f76468de0..7d4525bd8f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
@@ -35,6 +35,7 @@ import kotlin.math.abs
 class ExtendedBolusDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var ctx: Context
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index 7dd9f8eb1b..cb26aa1a5a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -41,6 +41,7 @@ import kotlin.math.abs
 class FillDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var ctx: Context
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index d9b2b027d8..a4172a8727 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -44,6 +44,7 @@ import kotlin.math.max
 class InsulinDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var commandQueue: CommandQueue
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index 935d511153..41efc7e42c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -46,6 +46,7 @@ import kotlin.collections.ArrayList
 
 class ProfileSwitchDialog : DialogFragmentWithDate() {
 
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var repository: AppRepository
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index f6d23f5fab..aba8fb579f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -33,6 +33,7 @@ import kotlin.math.abs
 class TempBasalDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var commandQueue: CommandQueue
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index a4edaa61ff..dba15262a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -42,6 +42,7 @@ import javax.inject.Inject
 class TempTargetDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var uel: UserEntryLogger
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index 8083f3c3d5..55fd9a773b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -43,6 +43,7 @@ import kotlin.math.abs
 class TreatmentDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var ctx: Context
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index de01e72d60..9af21b0194 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -2,9 +2,6 @@ package info.nightscout.androidaps.dialogs
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -16,7 +13,6 @@ import android.view.WindowManager
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.CompoundButton
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
@@ -124,11 +120,6 @@ class WizardDialog : DaggerDialogFragment() {
         isCancelable = true
         dialog?.setCanceledOnTouchOutside(false)
 
-        val drawable: Drawable? = context?.let { ContextCompat.getDrawable(it, info.nightscout.androidaps.core.R.drawable.dialog) }
-        drawable?.setColorFilter(PorterDuffColorFilter((context?.let { rh.gac(it, info.nightscout.androidaps.core.R.attr.dialogFragmentBackground) }!!), PorterDuff.Mode.SRC_IN))
-
-        dialog?.window?.setBackgroundDrawable(drawable)
-
         _binding = DialogWizardBinding.inflate(inflater, container, false)
         return binding.root
     }
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 45c65d5d8f..e52e675e3c 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.CalibrationDialog">
 
     <LinearLayout
@@ -14,14 +13,11 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 0455f7c3ae..eb9bc9c37b 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.CarbsDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index 1ea7d894a7..944308229b 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.CareDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:id="@+id/icon"
@@ -40,6 +37,7 @@
                 android:text="@string/careportal_profileswitch"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
+
         </RelativeLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 641b884bf1..b26d2cfc9a 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.ExtendedBolusDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index cce7dea78a..38f675407d 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.FillDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index 536d530ca8..d92878f9d6 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.InsulinDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_loop.xml b/app/src/main/res/layout/dialog_loop.xml
index f8d5581417..13738c5c3e 100644
--- a/app/src/main/res/layout/dialog_loop.xml
+++ b/app/src/main/res/layout/dialog_loop.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.LoopDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:id="@+id/loop_icon"
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 28794ebff2..7be36c1592 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.ProfileSwitchDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 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 e7a3820545..f43b8cc0fc 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.TempBasalDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 388957e6af..43717240e6 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.TempTargetDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index e087f99dd3..e4e2c8076c 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.TreatmentDialog">
 
     <LinearLayout
@@ -15,13 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp"
-            android:layout_marginBottom="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 5188ce930c..918dbd21dc 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.InsulinDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_wizardinfo.xml b/app/src/main/res/layout/dialog_wizardinfo.xml
index 52eccb6d84..517d1ecec2 100644
--- a/app/src/main/res/layout/dialog_wizardinfo.xml
+++ b/app/src/main/res/layout/dialog_wizardinfo.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".dialogs.WizardInfoDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/overview_editquickwizard_dialog.xml b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
index 5c405bfab1..89a45b5915 100644
--- a/app/src/main/res/layout/overview_editquickwizard_dialog.xml
+++ b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
@@ -1,6 +1,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".plugins.general.overview.dialogs.EditQuickWizardDialog">
@@ -11,12 +12,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt
index 1dea0c50a6..c20789e4d0 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt
@@ -13,6 +13,8 @@ import javax.inject.Inject
 
 class ChooseOperationDialog : DialogFragmentWithDate() {
 
+    @Inject lateinit var rh: ResourceHelper
+
     private var checkedIndex = -1
 
     private var _binding: AutomationDialogChooseOperationBinding? = null
diff --git a/automation/src/main/res/layout/automation_dialog_action.xml b/automation/src/main/res/layout/automation_dialog_action.xml
index 63acf76b0b..4033009e15 100644
--- a/automation/src/main/res/layout/automation_dialog_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_action.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".plugins.general.automation.dialogs.EditActionDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/automation/src/main/res/layout/automation_dialog_choose_action.xml b/automation/src/main/res/layout/automation_dialog_choose_action.xml
index 29ee8f8b91..8bbb4f5010 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_action.xml
@@ -2,11 +2,11 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+
+
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
@@ -15,12 +15,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/automation/src/main/res/layout/automation_dialog_choose_operation.xml b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
index 9437c7f846..ad78796e59 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_operation.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseOperationDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/automation/src/main/res/layout/automation_dialog_choose_trigger.xml b/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
index ef5d2b8f67..99eadab1bd 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context=".plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
index 84b5372c71..dc10ff98b9 100644
--- a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/automation/src/main/res/layout/automation_dialog_event.xml b/automation/src/main/res/layout/automation_dialog_event.xml
index bdaacc0837..ebbed9ad65 100644
--- a/automation/src/main/res/layout/automation_dialog_event.xml
+++ b/automation/src/main/res/layout/automation_dialog_event.xml
@@ -2,11 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
@@ -15,12 +14,10 @@
         android:orientation="vertical">
 
         <LinearLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
index 57e4902472..8634e6982f 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
@@ -1,9 +1,5 @@
 package info.nightscout.androidaps.dialogs
 
-import android.content.Context
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.SystemClock
 import android.view.LayoutInflater
@@ -11,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
-import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.activities.BolusProgressHelperActivity
 import info.nightscout.androidaps.core.R
@@ -29,7 +24,6 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
@@ -43,7 +37,6 @@ class BolusProgressDialog : DaggerDialogFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var uel: UserEntryLogger
-    @Inject lateinit var sp: SP
 
     private val disposable = CompositeDisposable()
 
@@ -90,15 +83,6 @@ class BolusProgressDialog : DaggerDialogFragment() {
         isCancelable = false
         dialog?.setCanceledOnTouchOutside(false)
 
-        val drawable: Drawable? = context?.let { ContextCompat.getDrawable(it, R.drawable.dialog) }
-        if ( sp.getBoolean(R.string.key_use_dark_mode, true)) {
-            drawable?.setColorFilter(PorterDuffColorFilter((rh.gc(R.color.background_dark)), PorterDuff.Mode.SRC_IN))
-        } else {
-            drawable?.setColorFilter(PorterDuffColorFilter((rh.gc(R.color.background_light)), PorterDuff.Mode.SRC_IN))
-        }
-
-        dialog?.window?.setBackgroundDrawable(drawable)
-
         _binding = DialogBolusprogressBinding.inflate(inflater, container, false)
         return binding.root
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
index 83d0c54013..8c74786594 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
@@ -2,9 +2,6 @@ package info.nightscout.androidaps.dialogs
 
 import android.app.DatePickerDialog
 import android.app.TimePickerDialog
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.text.format.DateFormat
 import android.view.View
@@ -13,7 +10,6 @@ import android.view.Window
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.core.R
@@ -21,7 +17,6 @@ import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject
@@ -31,7 +26,6 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var sp: SP
     @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var rh: ResourceHelper
 
     fun interface OnValueChangedListener {
         fun onValueChanged(value: Long)
@@ -74,11 +68,6 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
         dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         isCancelable = true
         dialog?.setCanceledOnTouchOutside(false)
-
-        val drawable: Drawable? = context?.let { ContextCompat.getDrawable(it, info.nightscout.androidaps.core.R.drawable.dialog) }
-        drawable?.setColorFilter(PorterDuffColorFilter((context?.let { rh.gac(it, info.nightscout.androidaps.core.R.attr.dialogFragmentBackground) }!!), PorterDuff.Mode.SRC_IN))
-
-        dialog?.window?.setBackgroundDrawable(drawable)
     }
 
     fun updateDateTime(timeMs: Long) {
diff --git a/core/src/main/res/drawable-hdpi/dialog.xml b/core/src/main/res/drawable-hdpi/dialog.xml
index 35266fa9fd..29cbd102a9 100644
--- a/core/src/main/res/drawable-hdpi/dialog.xml
+++ b/core/src/main/res/drawable-hdpi/dialog.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-<item
-android:right="10dp"
-android:left="10dp"
-android:bottom="10dp"
-android:top="10dp"
-    >
-<shape >
-    <padding
-        android:top="10dp"
-        android:bottom="2dp"
-        android:left="10dp"
-        android:right="10dp"
-        />
-    <solid android:color="#303030" />
-    <corners android:radius="12dp" />
-</shape>
-</item>
-</layer-list>
\ No newline at end of file
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <padding
+                android:bottom="2dp"
+                android:left="10dp"
+                android:right="10dp"
+                android:top="10dp" />
+            <solid android:color="?attr/backgroundColor" />
+            <corners android:radius="?android:dialogCornerRadius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/drawable-hdpi/dialog_header.xml b/core/src/main/res/drawable-hdpi/dialog_header.xml
new file mode 100644
index 0000000000..566a450adc
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/dialog_header.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <padding/>
+            <solid android:color="?dialogTitleBackground" />
+            <corners
+                android:topRightRadius="?android:dialogCornerRadius"
+                android:topLeftRadius="?android:dialogCornerRadius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml b/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
index a9bd780027..4e09f3b696 100644
--- a/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
+++ b/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="48dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M22,12l-4,-4v3H3v2h15v3z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M22,12l-4,-4v3H3v2h15v3z" />
 </vector>
diff --git a/core/src/main/res/layout/dialog_alert_custom.xml b/core/src/main/res/layout/dialog_alert_custom.xml
index 3c2df5b99b..d14304e946 100644
--- a/core/src/main/res/layout/dialog_alert_custom.xml
+++ b/core/src/main/res/layout/dialog_alert_custom.xml
@@ -4,17 +4,15 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <RelativeLayout
+        style="@style/StyleDialogHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?dialogTitleBackground"
-        android:orientation="horizontal"
-        android:padding="5dp">
+        android:layout_gravity="center" >
 
         <ImageView
             android:id="@+id/alertdialog_icon"
diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
index 6de8f83d97..c27c9eb665 100644
--- a/core/src/main/res/layout/dialog_bolusprogress.xml
+++ b/core/src/main/res/layout/dialog_bolusprogress.xml
@@ -1,18 +1,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     tools:context="info.nightscout.androidaps.dialogs.BolusProgressDialog">
 
     <RelativeLayout
+        style="@style/StyleDialogHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?attr/dialogTitleBackground"
-        android:orientation="horizontal"
-        android:padding="5dp">
+        android:layout_gravity="center">
 
         <ImageView
             android:id="@+id/header_icon"
diff --git a/core/src/main/res/layout/dialog_error.xml b/core/src/main/res/layout/dialog_error.xml
index e6112fa634..d1a3c83577 100644
--- a/core/src/main/res/layout/dialog_error.xml
+++ b/core/src/main/res/layout/dialog_error.xml
@@ -1,18 +1,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     tools:context="info.nightscout.androidaps.dialogs.ErrorDialog">
 
     <RelativeLayout
+        style="@style/StyleDialogHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?attr/dialogTitleBackground"
-        android:orientation="horizontal"
-        android:padding="5dp">
+        android:layout_gravity="center">
 
         <ImageView
             android:layout_width="wrap_content"
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index 6ab2d5e9fa..63205636d9 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -1,11 +1,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
     tools:context="info.nightscout.androidaps.dialogs.ProfileViewerDialog">
 
     <LinearLayout
@@ -14,12 +13,10 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            style="@style/StyleDialogHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?attr/dialogTitleBackground"
-            android:orientation="horizontal"
-            android:padding="5dp">
+            android:layout_gravity="center">
 
             <ImageView
                 android:id="@+id/header_icon"
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index da02bfa5b8..4cc2b76c9e 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -114,7 +114,6 @@
         <!---Application Background Color  -->
         <item name="android:windowBackground">@color/black</item>
         <!---Dialogfragment Background Color  -->
-        <item name="dialogFragmentBackground">@color/background_dark</item>
         <item name="android:dialogCornerRadius">12dp</item>
     </style>
 
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 1bd7fb7ff7..d13f25f935 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -86,7 +86,5 @@
     <attr name="splashBackgroundColor" format="reference|color" />
     <!---Disabled Text Color  -->
     <attr name="disabledTextColor" format="reference|color" />
-    <!---Dialogfragment Background Color  -->
-    <attr name="dialogFragmentBackground" format="reference|color" />
 
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 3d7f2cb4a1..e81a1bfbab 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -52,7 +52,7 @@
     <color name="pumpStatusBackground">#505050</color>
 
     <!--    Dialogs-->
-    <color name="dialog_title_background">#303030</color>
+    <color name="dialog_title_background">#CCCCCC</color>
     <color name="activity_title_background">#121212</color>
     <color name="dialog_title_color">#FFFFFF</color>
     <color name="dialog_title_icon_tint">#FFFFFF</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 470ce43d08..6e65161349 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -113,7 +113,6 @@
         <!---Application Background Color  -->
         <item name="android:windowBackground">@color/white</item>
         <!---Dialogfragment Background Color  -->
-        <item name="dialogFragmentBackground">@color/background_light</item>
         <item name="android:dialogCornerRadius">12dp</item>
     </style>
 
@@ -149,6 +148,19 @@
         <item name="android:focusable">true</item>
     </style>
 
+    <style name="StyleDialog">
+        <item name="android:padding">0dp</item>
+        <item name="android:minWidth">300dp</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:background">@drawable/dialog</item>
+    </style>
+
+    <style name="StyleDialogHeader">
+        <item name="android:padding">5dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:background">@drawable/dialog_header</item>
+    </style>
+
     <style name="OkCancelButton.Text" ns2:ignore="NewApi">
         <item name="android:textSize">@dimen/material_button_text_size</item>
         <item name="android:singleLine">true</item>
diff --git a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
index 33beac9647..b5ce3d531b 100644
--- a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
+++ b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
@@ -1,18 +1,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/StyleDialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="info.nightscout.androidaps.danars.dialogs.PairingProgressDialog" >
+    tools:context="info.nightscout.androidaps.danars.dialogs.PairingProgressDialog">
 
     <RelativeLayout
+        style="@style/StyleDialogHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?attr/dialogTitleBackground"
-        android:orientation="horizontal"
-        android:padding="5dp">
+        android:layout_gravity="center">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -41,32 +39,32 @@
         android:padding="5dp" />
 
     <TextView
-            android:id="@+id/danars_pairingprogress_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="15dp"
-            android:text="STATUS" />
+        android:id="@+id/danars_pairingprogress_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="15dp"
+        android:text="STATUS" />
 
-        <ProgressBar
-            android:id="@+id/danars_pairingprogress_progressbar"
-            style="@android:style/Widget.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:layout_marginBottom="20dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="20dp"
-            android:maxHeight="5dp"
-            android:minHeight="3dp" />
+    <ProgressBar
+        android:id="@+id/danars_pairingprogress_progressbar"
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:layout_marginBottom="20dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginTop="20dp"
+        android:maxHeight="5dp"
+        android:minHeight="3dp" />
 
-        <com.google.android.material.button.MaterialButton
-            style="@style/OkCancelButton.Text"
-            android:id="@+id/ok"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="15dp"
-            android:text="@string/ok" />
+    <com.google.android.material.button.MaterialButton
+        style="@style/OkCancelButton.Text"
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="15dp"
+        android:text="@string/ok" />
 
 </LinearLayout>