diff --git a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
index 3dc0f80e3..f29562b9d 100644
--- a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
@@ -20,10 +20,7 @@ class PickerItemWidget extends StatelessWidget {
     return GestureDetector(
       onTap: onTap,
       child: Container(
-        color: Theme.of(context)
-            .accentTextTheme!
-            .titleLarge!
-            .color!,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24),
           child: Row(
diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
index e4422c36f..8b59e8ab7 100644
--- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
@@ -52,10 +52,7 @@ class ExchangeConfirmPage extends BasePage {
                             .accentTextTheme!
                             .bodySmall!
                             .color!),
-                    color: Theme.of(context)
-                        .accentTextTheme!
-                        .titleLarge!
-                        .color!),
+                    color: Theme.of(context).dialogTheme.backgroundColor),
                 child: Column(
                   children: <Widget>[
                     Expanded(
diff --git a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
index 0080c551c..892886497 100644
--- a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
@@ -403,7 +403,7 @@ class TipButton extends StatelessWidget {
     }
 
     return isSelected
-      ? Theme.of(context).accentTextTheme!.titleLarge!.color!
+      ? Theme.of(context).dialogTheme.backgroundColor!
       : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
   }
 
@@ -413,7 +413,7 @@ class TipButton extends StatelessWidget {
     }
 
     return isSelected
-      ? Theme.of(context).accentTextTheme!.titleLarge!.color!
+      ? Theme.of(context).dialogTheme.backgroundColor!
       : Theme.of(context).primaryTextTheme!.labelSmall!.color!;
   }
 
diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index daa2e0a60..29c6704c7 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -120,10 +120,7 @@ class AddressTextField extends StatelessWidget {
                               padding: EdgeInsets.all(8),
                               decoration: BoxDecoration(
                                   color: buttonColor ??
-                                      Theme.of(context)
-                                          .accentTextTheme!
-                                          .titleLarge!
-                                          .color!,
+                                      Theme.of(context).dialogTheme.backgroundColor,
                                   borderRadius:
                                       BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
@@ -148,10 +145,7 @@ class AddressTextField extends StatelessWidget {
                               padding: EdgeInsets.all(8),
                               decoration: BoxDecoration(
                                   color: buttonColor ??
-                                      Theme.of(context)
-                                          .accentTextTheme
-                                          .titleLarge!
-                                          .color!,
+                                      Theme.of(context).dialogTheme.backgroundColor,
                                   borderRadius:
                                       BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
@@ -176,10 +170,7 @@ class AddressTextField extends StatelessWidget {
                               padding: EdgeInsets.all(8),
                               decoration: BoxDecoration(
                                   color: buttonColor ??
-                                      Theme.of(context)
-                                          .accentTextTheme!
-                                          .titleLarge!
-                                          .color!,
+                                      Theme.of(context).dialogTheme.backgroundColor,
                                   borderRadius:
                                       BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
diff --git a/lib/src/widgets/check_box_picker.dart b/lib/src/widgets/check_box_picker.dart
index 7fd0b57a3..bc152088f 100644
--- a/lib/src/widgets/check_box_picker.dart
+++ b/lib/src/widgets/check_box_picker.dart
@@ -53,10 +53,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
           child: ClipRRect(
             borderRadius: BorderRadius.all(Radius.circular(30)),
             child: Container(
-              color: Theme.of(context)
-                  .accentTextTheme!
-                  .titleLarge!
-                  .color!,
+              color: Theme.of(context).dialogTheme.backgroundColor,
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: MediaQuery.of(context).size.height * 0.65,
@@ -122,10 +119,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
       },
       child: Container(
         height: 55,
-        color: Theme.of(context)
-            .accentTextTheme!
-            .titleLarge!
-            .color!,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         padding: EdgeInsets.only(left: 24, right: 24),
         child: CheckboxListTile(
           value: item.value,
diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart
index 7be1d611a..00ee67d56 100644
--- a/lib/src/widgets/picker.dart
+++ b/lib/src/widgets/picker.dart
@@ -143,10 +143,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
           child: ClipRRect(
             borderRadius: BorderRadius.all(Radius.circular(30)),
             child: Container(
-              color: Theme.of(context)
-                  .accentTextTheme!
-                  .titleLarge!
-                  .color!,
+              color: Theme.of(context).dialogTheme.backgroundColor,
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: containerHeight,
@@ -302,10 +299,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
       },
       child: Container(
         height: 55,
-        color: Theme.of(context)
-            .accentTextTheme!
-            .titleLarge!
-            .color!,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         padding: EdgeInsets.symmetric(horizontal: 24),
         child: Row(
           mainAxisSize: MainAxisSize.max,
@@ -392,10 +386,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
       },
       child: Container(
         height: 55,
-        color: Theme.of(context)
-            .accentTextTheme!
-            .titleLarge!
-            .color!,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         padding: EdgeInsets.symmetric(horizontal: 24),
         child: Row(
           mainAxisSize: MainAxisSize.max,
diff --git a/lib/themes/bright_theme.dart b/lib/themes/bright_theme.dart
index 87c553cd2..10d1863b8 100644
--- a/lib/themes/bright_theme.dart
+++ b/lib/themes/bright_theme.dart
@@ -189,7 +189,6 @@ class BrightTheme extends LightTheme {
       accentTextTheme: TextTheme(
         // title -> titleLarge
         titleLarge: TextStyle(
-            color: Colors.white, // picker background
             backgroundColor: Palette.periwinkleCraiola, // picker divider
             decorationColor: Colors.white // dialog background
             ),
diff --git a/lib/themes/dark_theme.dart b/lib/themes/dark_theme.dart
index c7dcc5636..c14656298 100644
--- a/lib/themes/dark_theme.dart
+++ b/lib/themes/dark_theme.dart
@@ -27,6 +27,10 @@ class DarkTheme extends ThemeBase {
       hoverColor: PaletteDark.cyanBlue, // amount hint text (receive page)
       dividerColor: PaletteDark.dividerColor,
       hintColor: PaletteDark.pigeonBlue, // menu
+      dialogTheme: super
+          .themeData
+          .dialogTheme
+          .copyWith(backgroundColor: PaletteDark.nightBlue),
       textTheme: TextTheme(
           // title -> titleLarge
           titleLarge: TextStyle(
@@ -194,7 +198,6 @@ class DarkTheme extends ThemeBase {
       accentTextTheme: TextTheme(
         // title -> titleLarge
         titleLarge: TextStyle(
-            color: PaletteDark.nightBlue, // picker background
             backgroundColor: PaletteDark.dividerColor, // picker divider
             decorationColor: PaletteDark.darkNightBlue // dialog background
             ),
diff --git a/lib/themes/light_theme.dart b/lib/themes/light_theme.dart
index e8a1741c0..274a6033e 100644
--- a/lib/themes/light_theme.dart
+++ b/lib/themes/light_theme.dart
@@ -28,6 +28,10 @@ class LightTheme extends ThemeBase {
       hoverColor: Palette.darkBlueCraiola, // amount hint text (receive page)
       dividerColor: Palette.paleBlue,
       hintColor: Palette.gray,
+      dialogTheme: super
+          .themeData
+          .dialogTheme
+          .copyWith(backgroundColor: Colors.white),
       textTheme: TextTheme(
           // title -> titleLarge
           titleLarge: TextStyle(
@@ -192,7 +196,6 @@ class LightTheme extends ThemeBase {
       accentTextTheme: TextTheme(
         // title -> headlititleLargene6
         titleLarge: TextStyle(
-            color: Colors.white, // picker background
             backgroundColor: Palette.periwinkleCraiola, // picker divider
             decorationColor: Colors.white // dialog background
             ),