diff --git a/lib/colors.dart b/lib/colors.dart
index ca8070d8c..9f4dad0d4 100644
--- a/lib/colors.dart
+++ b/lib/colors.dart
@@ -12,13 +12,13 @@ class InvoiceStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kInvoiceStatusDraft: _colorTheme.colorDarkGray,
+      kInvoiceStatusDraft: _colorTheme.colorGray,
       kInvoiceStatusSent: _colorTheme.colorInfo,
       kInvoiceStatusPartial: _colorTheme.colorPrimary,
       kInvoiceStatusPaid: _colorTheme.colorSuccess,
       kInvoiceStatusPastDue: _colorTheme.colorDanger,
-      kInvoiceStatusCancelled: _colorTheme.colorLightGray,
-      kInvoiceStatusReversed: _colorTheme.colorLightGray,
+      kInvoiceStatusCancelled: _colorTheme.colorGray,
+      kInvoiceStatusReversed: _colorTheme.colorGray,
       kInvoiceStatusViewed: _colorTheme.colorWarning,
     };
   }
@@ -31,11 +31,11 @@ class RecurringInvoiceStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kRecurringInvoiceStatusDraft: _colorTheme.colorDarkGray,
+      kRecurringInvoiceStatusDraft: _colorTheme.colorGray,
       kRecurringInvoiceStatusActive: _colorTheme.colorSuccess,
-      kRecurringInvoiceStatusPaused: _colorTheme.colorLightGray,
+      kRecurringInvoiceStatusPaused: _colorTheme.colorGray,
       kRecurringInvoiceStatusCompleted: _colorTheme.colorSuccess,
-      kRecurringInvoiceStatusPending: _colorTheme.colorLightGray,
+      kRecurringInvoiceStatusPending: _colorTheme.colorGray,
     };
   }
 }
@@ -47,7 +47,7 @@ class CreditStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kCreditStatusDraft: _colorTheme.colorDarkGray,
+      kCreditStatusDraft: _colorTheme.colorGray,
       kCreditStatusSent: _colorTheme.colorInfo,
       kCreditStatusPartial: _colorTheme.colorPrimary,
       kCreditStatusApplied: _colorTheme.colorSuccess,
@@ -62,7 +62,7 @@ class QuoteStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kQuoteStatusDraft: _colorTheme.colorDarkGray,
+      kQuoteStatusDraft: _colorTheme.colorGray,
       kQuoteStatusSent: _colorTheme.colorInfo,
       kQuoteStatusApproved: _colorTheme.colorPrimary,
       kQuoteStatusConverted: _colorTheme.colorSuccess,
@@ -79,14 +79,14 @@ class PaymentStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kPaymentStatusPending: _colorTheme.colorDarkGray,
-      kPaymentStatusCancelled: _colorTheme.colorLightGray,
+      kPaymentStatusPending: _colorTheme.colorGray,
+      kPaymentStatusCancelled: _colorTheme.colorGray,
       kPaymentStatusFailed: _colorTheme.colorDanger,
       kPaymentStatusCompleted: _colorTheme.colorSuccess,
       kPaymentStatusPartiallyRefunded: _colorTheme.colorPrimary,
-      kPaymentStatusRefunded: _colorTheme.colorLightGray,
-      kPaymentStatusUnapplied: _colorTheme.colorDarkGray,
-      kPaymentStatusPartiallyUnapplied: _colorTheme.colorDarkGray,
+      kPaymentStatusRefunded: _colorTheme.colorGray,
+      kPaymentStatusUnapplied: _colorTheme.colorGray,
+      kPaymentStatusPartiallyUnapplied: _colorTheme.colorGray,
     };
   }
 }
@@ -98,7 +98,7 @@ class ExpenseStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kExpenseStatusLogged: _colorTheme.colorDarkGray,
+      kExpenseStatusLogged: _colorTheme.colorGray,
       kExpenseStatusPending: _colorTheme.colorPrimary,
       kExpenseStatusInvoiced: _colorTheme.colorSuccess,
     };
@@ -112,7 +112,7 @@ class TaskStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kTaskStatusLogged: _colorTheme.colorDarkGray,
+      kTaskStatusLogged: _colorTheme.colorGray,
       kTaskStatusRunning: _colorTheme.colorPrimary,
       kTaskStatusInvoiced: _colorTheme.colorSuccess,
     };
diff --git a/lib/data/models/static/color_theme_model.dart b/lib/data/models/static/color_theme_model.dart
index 2d9e2336a..89e63fd79 100644
--- a/lib/data/models/static/color_theme_model.dart
+++ b/lib/data/models/static/color_theme_model.dart
@@ -5,22 +5,21 @@ import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/constants.dart';
 
 class ColorTheme {
-  ColorTheme(
-      {this.colorPrimary,
-      this.colorInfo,
-      this.colorSuccess,
-      this.colorWarning,
-      this.colorDanger,
-      this.colorLightGray = const Color(0xff888888),
-      this.colorDarkGray = const Color(0xff333333)});
+  ColorTheme({
+    this.colorPrimary,
+    this.colorInfo,
+    this.colorSuccess,
+    this.colorWarning,
+    this.colorDanger,
+    this.colorGray = const Color(0xff888888),
+  });
 
   Color colorPrimary;
   Color colorInfo;
   Color colorSuccess;
   Color colorWarning;
   Color colorDanger;
-  Color colorLightGray;
-  Color colorDarkGray;
+  Color colorGray;
 }
 
 Map<String, ColorTheme> colorThemesMap = {