diff --git a/lib/colors.dart b/lib/colors.dart
index 9f8bb4544..e120d7c7b 100644
--- a/lib/colors.dart
+++ b/lib/colors.dart
@@ -12,13 +12,13 @@ class InvoiceStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kInvoiceStatusDraft: _colorTheme.colorGray,
+      kInvoiceStatusDraft: _colorTheme.colorLightGray,
       kInvoiceStatusSent: _colorTheme.colorInfo,
       kInvoiceStatusPartial: _colorTheme.colorPrimary,
       kInvoiceStatusPaid: _colorTheme.colorSuccess,
       kInvoiceStatusPastDue: _colorTheme.colorDanger,
-      kInvoiceStatusCancelled: _colorTheme.colorGray,
-      kInvoiceStatusReversed: _colorTheme.colorGray,
+      kInvoiceStatusCancelled: _colorTheme.colorDarkGray,
+      kInvoiceStatusReversed: _colorTheme.colorDarkGray,
       kInvoiceStatusViewed: _colorTheme.colorWarning,
     };
   }
@@ -31,11 +31,11 @@ class RecurringInvoiceStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kRecurringInvoiceStatusDraft: _colorTheme.colorGray,
+      kRecurringInvoiceStatusDraft: _colorTheme.colorLightGray,
       kRecurringInvoiceStatusActive: _colorTheme.colorSuccess,
-      kRecurringInvoiceStatusPaused: _colorTheme.colorGray,
-      kRecurringInvoiceStatusCompleted: _colorTheme.colorSuccess,
-      kRecurringInvoiceStatusPending: _colorTheme.colorGray,
+      kRecurringInvoiceStatusPaused: _colorTheme.colorDarkGray,
+      kRecurringInvoiceStatusCompleted: _colorTheme.colorInfo,
+      kRecurringInvoiceStatusPending: _colorTheme.colorPrimary,
     };
   }
 }
@@ -47,7 +47,7 @@ class CreditStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kCreditStatusDraft: _colorTheme.colorGray,
+      kCreditStatusDraft: _colorTheme.colorLightGray,
       kCreditStatusSent: _colorTheme.colorInfo,
       kCreditStatusPartial: _colorTheme.colorPrimary,
       kCreditStatusApplied: _colorTheme.colorSuccess,
@@ -63,7 +63,7 @@ class PurchaseOrderStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kPurchaseOrderStatusDraft: _colorTheme.colorGray,
+      kPurchaseOrderStatusDraft: _colorTheme.colorLightGray,
       kPurchaseOrderStatusSent: _colorTheme.colorInfo,
       kPurchaseOrderStatusAccepted: _colorTheme.colorPrimary,
       kPurchaseOrderStatusReceived: _colorTheme.colorSuccess,
@@ -94,7 +94,7 @@ class QuoteStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kQuoteStatusDraft: _colorTheme.colorGray,
+      kQuoteStatusDraft: _colorTheme.colorLightGray,
       kQuoteStatusSent: _colorTheme.colorInfo,
       kQuoteStatusApproved: _colorTheme.colorPrimary,
       kQuoteStatusConverted: _colorTheme.colorSuccess,
@@ -111,14 +111,14 @@ class PaymentStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kPaymentStatusPending: _colorTheme.colorGray,
-      kPaymentStatusCancelled: _colorTheme.colorGray,
+      kPaymentStatusPending: _colorTheme.colorLightGray,
+      kPaymentStatusCancelled: _colorTheme.colorDarkGray,
       kPaymentStatusFailed: _colorTheme.colorDanger,
       kPaymentStatusCompleted: _colorTheme.colorSuccess,
       kPaymentStatusPartiallyRefunded: _colorTheme.colorPrimary,
-      kPaymentStatusRefunded: _colorTheme.colorGray,
-      kPaymentStatusUnapplied: _colorTheme.colorGray,
-      kPaymentStatusPartiallyUnapplied: _colorTheme.colorGray,
+      kPaymentStatusRefunded: _colorTheme.colorDarkGray,
+      kPaymentStatusUnapplied: _colorTheme.colorInfo,
+      kPaymentStatusPartiallyUnapplied: _colorTheme.colorInfo,
     };
   }
 }
@@ -130,7 +130,7 @@ class ExpenseStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kExpenseStatusLogged: _colorTheme.colorGray,
+      kExpenseStatusLogged: _colorTheme.colorLightGray,
       kExpenseStatusPending: _colorTheme.colorPrimary,
       kExpenseStatusInvoiced: _colorTheme.colorSuccess,
       kExpenseStatusPaid: _colorTheme.colorInfo,
@@ -145,7 +145,7 @@ class TaskStatusColors {
 
   Map<String, Color> get colors {
     return {
-      kTaskStatusLogged: _colorTheme.colorGray,
+      kTaskStatusLogged: _colorTheme.colorLightGray,
       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 89e63fd79..f42773271 100644
--- a/lib/data/models/static/color_theme_model.dart
+++ b/lib/data/models/static/color_theme_model.dart
@@ -11,7 +11,8 @@ class ColorTheme {
     this.colorSuccess,
     this.colorWarning,
     this.colorDanger,
-    this.colorGray = const Color(0xff888888),
+    this.colorLightGray = const Color(0xff888888),
+    this.colorDarkGray = const Color(0xff444444),
   });
 
   Color colorPrimary;
@@ -19,7 +20,8 @@ class ColorTheme {
   Color colorSuccess;
   Color colorWarning;
   Color colorDanger;
-  Color colorGray;
+  Color colorLightGray;
+  Color colorDarkGray;
 }
 
 Map<String, ColorTheme> colorThemesMap = {