diff --git a/lib/main.dart b/lib/main.dart
index b58a5654f..eabb8e93a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,3 +1,4 @@
+import 'package:redux/redux.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
@@ -12,7 +13,6 @@ import 'package:invoiceninja/ui/client/view/client_view_vm.dart';
 import 'package:invoiceninja/ui/invoice/edit/invoice_edit_vm.dart';
 import 'package:invoiceninja/ui/invoice/view/invoice_view_vm.dart';
 import 'package:invoiceninja/ui/product/edit/product_edit_vm.dart';
-import 'package:redux/redux.dart';
 import 'package:invoiceninja/utils/localization.dart';
 import 'package:invoiceninja/ui/auth/login_vm.dart';
 import 'package:invoiceninja/ui/dashboard/dashboard_screen.dart';
@@ -74,8 +74,8 @@ class _InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
           primaryColorLight: const Color(0xFF5dabf4),
           primaryColorDark: const Color(0xFF0D5D91),
           indicatorColor: Colors.white,
-          bottomAppBarColor: Colors.grey[300],
-          backgroundColor: Colors.grey[200],
+          bottomAppBarColor: Colors.grey.shade300,
+          backgroundColor: Colors.grey.shade200,
         ),
 
         //dark theme
diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart
index 316c4c76e..c0eb61804 100644
--- a/lib/ui/invoice/edit/invoice_edit.dart
+++ b/lib/ui/invoice/edit/invoice_edit.dart
@@ -101,12 +101,15 @@ class _InvoiceEditState extends State<InvoiceEdit>
           ),
         ),
         bottomNavigationBar: BottomAppBar(
+          color: Theme.of(context).primaryColor,
           shape: CircularNotchedRectangle(),
           child: Padding(
             padding: const EdgeInsets.all(14.0),
             child: Text(
               '${localization.total}: ${formatNumber(invoice.calculateTotal(viewModel.company.enableInclusiveTaxes), context, clientId: viewModel.invoice.clientId)}',
               style: TextStyle(
+                //color: Theme.of(context).selectedRowColor,
+                color: Colors.white,
                 fontSize: 18.0,
               ),
             ),