diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart
index 144c10000..aed10dedf 100644
--- a/lib/data/models/models.dart
+++ b/lib/data/models/models.dart
@@ -130,6 +130,10 @@ class EntityAction extends EnumClass {
 
   @override
   String toString() {
+    if (this == EntityAction.addToInvoice) {
+      return 'action_add_to_invoice';
+    }
+
     return toSnakeCase(super.toString());
   }
 
diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart
index 8439bf6c4..b9a691f59 100644
--- a/lib/redux/client/client_actions.dart
+++ b/lib/redux/client/client_actions.dart
@@ -442,7 +442,8 @@ void handleClientAction(
     case EntityAction.restore:
       final message = clientIds.length > 1
           ? localization.restoredClients
-              .replaceFirst(':value', clientIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', clientIds.length.toString())
           : localization.restoredClient;
       store.dispatch(RestoreClientsRequest(
           snackBarCompleter<Null>(context, message), clientIds));
@@ -450,7 +451,8 @@ void handleClientAction(
     case EntityAction.archive:
       final message = clientIds.length > 1
           ? localization.archivedClients
-              .replaceFirst(':value', clientIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', clientIds.length.toString())
           : localization.archivedClient;
       store.dispatch(ArchiveClientsRequest(
           snackBarCompleter<Null>(context, message), clientIds));
@@ -458,7 +460,8 @@ void handleClientAction(
     case EntityAction.delete:
       final message = clientIds.length > 1
           ? localization.deletedClients
-              .replaceFirst(':value', clientIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', clientIds.length.toString())
           : localization.deletedClient;
       store.dispatch(DeleteClientsRequest(
           snackBarCompleter<Null>(context, message), clientIds));
diff --git a/lib/redux/company_gateway/company_gateway_actions.dart b/lib/redux/company_gateway/company_gateway_actions.dart
index 85acda4d6..b8e6a50ab 100644
--- a/lib/redux/company_gateway/company_gateway_actions.dart
+++ b/lib/redux/company_gateway/company_gateway_actions.dart
@@ -282,7 +282,8 @@ void handleCompanyGatewayAction(BuildContext context,
     case EntityAction.restore:
       final message = companyGatewayIds.length > 1
           ? localization.restoredCompanyGateways
-              .replaceFirst(':value', companyGatewayIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', companyGatewayIds.length.toString())
           : localization.restoredCompanyGateway;
       store.dispatch(RestoreCompanyGatewayRequest(
           snackBarCompleter<Null>(context, message), companyGatewayIds));
@@ -290,7 +291,8 @@ void handleCompanyGatewayAction(BuildContext context,
     case EntityAction.archive:
       final message = companyGatewayIds.length > 1
           ? localization.archivedCompanyGateways
-              .replaceFirst(':value', companyGatewayIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', companyGatewayIds.length.toString())
           : localization.archivedCompanyGateway;
       store.dispatch(ArchiveCompanyGatewayRequest(
           snackBarCompleter<Null>(context, message), companyGatewayIds));
@@ -298,7 +300,8 @@ void handleCompanyGatewayAction(BuildContext context,
     case EntityAction.delete:
       final message = companyGatewayIds.length > 1
           ? localization.deletedCompanyGateways
-              .replaceFirst(':value', companyGatewayIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', companyGatewayIds.length.toString())
           : localization.deletedCompanyGateway;
       store.dispatch(DeleteCompanyGatewayRequest(
           snackBarCompleter<Null>(context, message), companyGatewayIds));
diff --git a/lib/redux/credit/credit_actions.dart b/lib/redux/credit/credit_actions.dart
index 8334f2b15..54eece929 100644
--- a/lib/redux/credit/credit_actions.dart
+++ b/lib/redux/credit/credit_actions.dart
@@ -607,7 +607,8 @@ Future handleCreditAction(
     case EntityAction.restore:
       final message = creditIds.length > 1
           ? localization.restoredCredits
-              .replaceFirst(':value', creditIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', creditIds.length.toString())
           : localization.restoredCredit;
       store.dispatch(RestoreCreditsRequest(
           snackBarCompleter<Null>(context, message), creditIds));
@@ -615,7 +616,8 @@ Future handleCreditAction(
     case EntityAction.archive:
       final message = creditIds.length > 1
           ? localization.archivedCredits
-              .replaceFirst(':value', creditIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', creditIds.length.toString())
           : localization.archivedCredit;
       store.dispatch(ArchiveCreditsRequest(
           snackBarCompleter<Null>(context, message), creditIds));
@@ -623,7 +625,8 @@ Future handleCreditAction(
     case EntityAction.delete:
       final message = creditIds.length > 1
           ? localization.deletedCredits
-              .replaceFirst(':value', creditIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', creditIds.length.toString())
           : localization.deletedCredit;
       store.dispatch(DeleteCreditsRequest(
           snackBarCompleter<Null>(context, message), creditIds));
diff --git a/lib/redux/design/design_actions.dart b/lib/redux/design/design_actions.dart
index 5dcda4dbb..f873aedec 100644
--- a/lib/redux/design/design_actions.dart
+++ b/lib/redux/design/design_actions.dart
@@ -296,7 +296,8 @@ void handleDesignAction(
     case EntityAction.restore:
       final message = designIds.length > 1
           ? localization.restoredDesigns
-              .replaceFirst(':value', designIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', designIds.length.toString())
           : localization.restoredDesign;
       store.dispatch(RestoreDesignsRequest(
           snackBarCompleter<Null>(context, message), designIds));
@@ -304,7 +305,8 @@ void handleDesignAction(
     case EntityAction.archive:
       final message = designIds.length > 1
           ? localization.archivedDesigns
-              .replaceFirst(':value', designIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', designIds.length.toString())
           : localization.archivedDesign;
       store.dispatch(ArchiveDesignsRequest(
           snackBarCompleter<Null>(context, message), designIds));
@@ -312,7 +314,8 @@ void handleDesignAction(
     case EntityAction.delete:
       final message = designIds.length > 1
           ? localization.deletedDesigns
-              .replaceFirst(':value', designIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', designIds.length.toString())
           : localization.deletedDesign;
       store.dispatch(DeleteDesignsRequest(
           snackBarCompleter<Null>(context, message), designIds));
diff --git a/lib/redux/document/document_actions.dart b/lib/redux/document/document_actions.dart
index 87d908680..c4251bee6 100644
--- a/lib/redux/document/document_actions.dart
+++ b/lib/redux/document/document_actions.dart
@@ -281,7 +281,8 @@ void handleDocumentAction(
     case EntityAction.restore:
       final message = documentIds.length > 1
           ? localization.restoredDocuments
-              .replaceFirst(':value', documentIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', documentIds.length.toString())
           : localization.restoredDocument;
       store.dispatch(RestoreDocumentRequest(
           snackBarCompleter<Null>(context, message), documentIds));
@@ -289,7 +290,8 @@ void handleDocumentAction(
     case EntityAction.archive:
       final message = documentIds.length > 1
           ? localization.archivedDocuments
-              .replaceFirst(':value', documentIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', documentIds.length.toString())
           : localization.archivedDocument;
       store.dispatch(ArchiveDocumentRequest(
           snackBarCompleter<Null>(context, message), documentIds));
@@ -298,7 +300,7 @@ void handleDocumentAction(
     case EntityAction.delete:
       final message = documentIds.length > 1
           ? localization.deletedDocuments
-              .replaceFirst(':value', documentIds.length.toString())
+              .replaceFirst(':value', ':count').replaceFirst(':count', documentIds.length.toString())
           : localization.deletedDocument;
       store.dispatch(DeleteDocumentRequest(
         completer: snackBarCompleter<Null>(context, message),
diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart
index 066634d51..a163daf66 100644
--- a/lib/redux/expense/expense_actions.dart
+++ b/lib/redux/expense/expense_actions.dart
@@ -329,7 +329,8 @@ void handleExpenseAction(
     case EntityAction.restore:
       final message = expenseIds.length > 1
           ? localization.restoredExpenses
-              .replaceFirst(':value', expenseIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', expenseIds.length.toString())
           : localization.restoredExpense;
       store.dispatch(RestoreExpenseRequest(
           snackBarCompleter<Null>(context, message), expenseIds));
@@ -337,7 +338,8 @@ void handleExpenseAction(
     case EntityAction.archive:
       final message = expenseIds.length > 1
           ? localization.archivedExpenses
-              .replaceFirst(':value', expenseIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', expenseIds.length.toString())
           : localization.archivedExpense;
       store.dispatch(ArchiveExpenseRequest(
           snackBarCompleter<Null>(context, message), expenseIds));
@@ -345,7 +347,8 @@ void handleExpenseAction(
     case EntityAction.delete:
       final message = expenseIds.length > 1
           ? localization.deletedExpenses
-              .replaceFirst(':value', expenseIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', expenseIds.length.toString())
           : localization.deletedExpense;
       store.dispatch(DeleteExpenseRequest(
           snackBarCompleter<Null>(context, message), expenseIds));
diff --git a/lib/redux/expense_category/expense_category_actions.dart b/lib/redux/expense_category/expense_category_actions.dart
index 3f6dcaf53..385645921 100644
--- a/lib/redux/expense_category/expense_category_actions.dart
+++ b/lib/redux/expense_category/expense_category_actions.dart
@@ -285,7 +285,8 @@ void handleExpenseCategoryAction(BuildContext context,
     case EntityAction.restore:
       final message = expenseCategoryIds.length > 1
           ? localization.restoredExpenseCategories
-              .replaceFirst(':value', expenseCategoryIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', expenseCategoryIds.length.toString())
           : localization.restoredExpenseCategory;
       store.dispatch(RestoreExpenseCategoriesRequest(
           snackBarCompleter<Null>(context, message), expenseCategoryIds));
@@ -293,7 +294,8 @@ void handleExpenseCategoryAction(BuildContext context,
     case EntityAction.archive:
       final message = expenseCategoryIds.length > 1
           ? localization.archivedExpenseCategories
-              .replaceFirst(':value', expenseCategoryIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', expenseCategoryIds.length.toString())
           : localization.archivedExpenseCategory;
       store.dispatch(ArchiveExpenseCategoriesRequest(
           snackBarCompleter<Null>(context, message), expenseCategoryIds));
@@ -301,7 +303,8 @@ void handleExpenseCategoryAction(BuildContext context,
     case EntityAction.delete:
       final message = expenseCategoryIds.length > 1
           ? localization.deletedExpenseCategories
-              .replaceFirst(':value', expenseCategoryIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', expenseCategoryIds.length.toString())
           : localization.deletedExpenseCategory;
       store.dispatch(DeleteExpenseCategoriesRequest(
           snackBarCompleter<Null>(context, message), expenseCategoryIds));
diff --git a/lib/redux/group/group_actions.dart b/lib/redux/group/group_actions.dart
index e9c27c201..899bcd38c 100644
--- a/lib/redux/group/group_actions.dart
+++ b/lib/redux/group/group_actions.dart
@@ -247,7 +247,8 @@ void handleGroupAction(
     case EntityAction.restore:
       final message = groupIds.length > 1
           ? localization.restoredGroups
-              .replaceFirst(':value', groupIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', groupIds.length.toString())
           : localization.restoredGroup;
       store.dispatch(RestoreGroupRequest(
           snackBarCompleter<Null>(context, message), groupIds));
@@ -255,7 +256,8 @@ void handleGroupAction(
     case EntityAction.archive:
       final message = groupIds.length > 1
           ? localization.archivedGroups
-              .replaceFirst(':value', groupIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', groupIds.length.toString())
           : localization.archivedGroup;
       store.dispatch(ArchiveGroupRequest(
           snackBarCompleter<Null>(context, message), groupIds));
@@ -263,7 +265,8 @@ void handleGroupAction(
     case EntityAction.delete:
       final message = groupIds.length > 1
           ? localization.deletedGroups
-              .replaceFirst(':value', groupIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', groupIds.length.toString())
           : localization.deletedGroup;
       store.dispatch(DeleteGroupRequest(
           snackBarCompleter<Null>(context, message), groupIds));
diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart
index f8b475e1f..37422c58f 100644
--- a/lib/redux/invoice/invoice_actions.dart
+++ b/lib/redux/invoice/invoice_actions.dart
@@ -709,7 +709,8 @@ void handleInvoiceAction(BuildContext context, List<BaseEntity> invoices,
     case EntityAction.restore:
       final message = invoiceIds.length > 1
           ? localization.restoredInvoices
-              .replaceFirst(':value', invoiceIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', invoiceIds.length.toString())
           : localization.restoredInvoice;
       store.dispatch(RestoreInvoicesRequest(
           snackBarCompleter<Null>(context, message), invoiceIds));
@@ -717,7 +718,8 @@ void handleInvoiceAction(BuildContext context, List<BaseEntity> invoices,
     case EntityAction.archive:
       final message = invoiceIds.length > 1
           ? localization.archivedInvoices
-              .replaceFirst(':value', invoiceIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', invoiceIds.length.toString())
           : localization.archivedInvoice;
       store.dispatch(ArchiveInvoicesRequest(
           snackBarCompleter<Null>(context, message), invoiceIds));
@@ -725,7 +727,8 @@ void handleInvoiceAction(BuildContext context, List<BaseEntity> invoices,
     case EntityAction.delete:
       final message = invoiceIds.length > 1
           ? localization.deletedInvoices
-              .replaceFirst(':value', invoiceIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', invoiceIds.length.toString())
           : localization.deletedInvoice;
       store.dispatch(DeleteInvoicesRequest(
           snackBarCompleter<Null>(context, message), invoiceIds));
diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart
index 081eebb80..4a8ad819b 100644
--- a/lib/redux/payment/payment_actions.dart
+++ b/lib/redux/payment/payment_actions.dart
@@ -356,7 +356,8 @@ void handlePaymentAction(
     case EntityAction.restore:
       final message = paymentIds.length > 1
           ? localization.restoredPayments
-              .replaceFirst(':value', paymentIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', paymentIds.length.toString())
           : localization.restoredPayment;
       store.dispatch(RestorePaymentsRequest(
           snackBarCompleter<Null>(context, message), paymentIds));
@@ -364,7 +365,8 @@ void handlePaymentAction(
     case EntityAction.archive:
       final message = paymentIds.length > 1
           ? localization.archivedPayments
-              .replaceFirst(':value', paymentIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', paymentIds.length.toString())
           : localization.archivedPayment;
       store.dispatch(ArchivePaymentsRequest(
           snackBarCompleter<Null>(context, message), paymentIds));
@@ -372,7 +374,8 @@ void handlePaymentAction(
     case EntityAction.delete:
       final message = paymentIds.length > 1
           ? localization.deletedPayments
-              .replaceFirst(':value', paymentIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', paymentIds.length.toString())
           : localization.deletedPayment;
       store.dispatch(DeletePaymentsRequest(
           snackBarCompleter<Null>(context, message), paymentIds));
diff --git a/lib/redux/payment_term/payment_term_actions.dart b/lib/redux/payment_term/payment_term_actions.dart
index 9c546f0a0..ad19aea67 100644
--- a/lib/redux/payment_term/payment_term_actions.dart
+++ b/lib/redux/payment_term/payment_term_actions.dart
@@ -267,7 +267,8 @@ void handlePaymentTermAction(
     case EntityAction.restore:
       final message = paymentTermIds.length > 1
           ? localization.restoredPaymentTerms
-              .replaceFirst(':value', paymentTermIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', paymentTermIds.length.toString())
           : localization.restoredPaymentTerm;
       store.dispatch(RestorePaymentTermsRequest(
           snackBarCompleter<Null>(context, message), paymentTermIds));
@@ -275,7 +276,8 @@ void handlePaymentTermAction(
     case EntityAction.archive:
       final message = paymentTermIds.length > 1
           ? localization.archivedPaymentTerms
-              .replaceFirst(':value', paymentTermIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', paymentTermIds.length.toString())
           : localization.archivedPaymentTerm;
       store.dispatch(ArchivePaymentTermsRequest(
           snackBarCompleter<Null>(context, message), paymentTermIds));
@@ -283,7 +285,8 @@ void handlePaymentTermAction(
     case EntityAction.delete:
       final message = paymentTermIds.length > 1
           ? localization.deletedPaymentTerms
-              .replaceFirst(':value', paymentTermIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', paymentTermIds.length.toString())
           : localization.deletedPaymentTerm;
       store.dispatch(DeletePaymentTermsRequest(
           snackBarCompleter<Null>(context, message), paymentTermIds));
diff --git a/lib/redux/product/product_actions.dart b/lib/redux/product/product_actions.dart
index 9e34d807a..41e6f2ae7 100644
--- a/lib/redux/product/product_actions.dart
+++ b/lib/redux/product/product_actions.dart
@@ -300,7 +300,8 @@ void handleProductAction(
     case EntityAction.restore:
       final message = productIds.length > 1
           ? localization.restoredProducts
-              .replaceFirst(':value', productIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', productIds.length.toString())
           : localization.restoredProduct;
       store.dispatch(RestoreProductsRequest(
           snackBarCompleter<Null>(context, message), productIds));
@@ -308,7 +309,8 @@ void handleProductAction(
     case EntityAction.archive:
       final message = productIds.length > 1
           ? localization.archivedProducts
-              .replaceFirst(':value', productIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', productIds.length.toString())
           : localization.archivedProduct;
       store.dispatch(ArchiveProductsRequest(
           snackBarCompleter<Null>(context, message), productIds));
@@ -316,7 +318,8 @@ void handleProductAction(
     case EntityAction.delete:
       final message = productIds.length > 1
           ? localization.deletedProducts
-              .replaceFirst(':value', productIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', productIds.length.toString())
           : localization.deletedProduct;
       store.dispatch(DeleteProductsRequest(
           snackBarCompleter<Null>(context, message), productIds));
diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart
index 12f2281f5..6296e4409 100644
--- a/lib/redux/project/project_actions.dart
+++ b/lib/redux/project/project_actions.dart
@@ -319,7 +319,8 @@ void handleProjectAction(
     case EntityAction.restore:
       final message = projectIds.length > 1
           ? localization.restoredProjects
-              .replaceFirst(':value', projectIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', projectIds.length.toString())
           : localization.restoredProject;
       store.dispatch(RestoreProjectRequest(
           snackBarCompleter<Null>(context, message), projectIds));
@@ -327,7 +328,8 @@ void handleProjectAction(
     case EntityAction.archive:
       final message = projectIds.length > 1
           ? localization.archivedProjects
-              .replaceFirst(':value', projectIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', projectIds.length.toString())
           : localization.archivedProject;
       store.dispatch(ArchiveProjectRequest(
           snackBarCompleter<Null>(context, message), projectIds));
@@ -335,7 +337,8 @@ void handleProjectAction(
     case EntityAction.delete:
       final message = projectIds.length > 1
           ? localization.deletedProjects
-              .replaceFirst(':value', projectIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', projectIds.length.toString())
           : localization.deletedProject;
       store.dispatch(DeleteProjectRequest(
           snackBarCompleter<Null>(context, message), projectIds));
diff --git a/lib/redux/quote/quote_actions.dart b/lib/redux/quote/quote_actions.dart
index 17461384a..5f9a15483 100644
--- a/lib/redux/quote/quote_actions.dart
+++ b/lib/redux/quote/quote_actions.dart
@@ -528,7 +528,8 @@ Future handleQuoteAction(
     case EntityAction.approve:
       final message = quoteIds.length > 1
           ? localization.approvedQuotes
-              .replaceFirst(':value', quoteIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', quoteIds.length.toString())
           : localization.approveQuote;
       store.dispatch(
           ApproveQuotes(snackBarCompleter<Null>(context, message), quoteIds));
@@ -649,7 +650,8 @@ Future handleQuoteAction(
     case EntityAction.restore:
       final message = quoteIds.length > 1
           ? localization.restoredQuotes
-              .replaceFirst(':value', quoteIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', quoteIds.length.toString())
           : localization.restoredQuote;
       store.dispatch(RestoreQuotesRequest(
           snackBarCompleter<Null>(context, message), quoteIds));
@@ -657,7 +659,8 @@ Future handleQuoteAction(
     case EntityAction.archive:
       final message = quoteIds.length > 1
           ? localization.archivedQuotes
-              .replaceFirst(':value', quoteIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', quoteIds.length.toString())
           : localization.archivedQuote;
       store.dispatch(ArchiveQuotesRequest(
           snackBarCompleter<Null>(context, message), quoteIds));
@@ -665,7 +668,8 @@ Future handleQuoteAction(
     case EntityAction.delete:
       final message = quoteIds.length > 1
           ? localization.deletedQuotes
-              .replaceFirst(':value', quoteIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', quoteIds.length.toString())
           : localization.deletedQuote;
       store.dispatch(DeleteQuotesRequest(
           snackBarCompleter<Null>(context, message), quoteIds));
diff --git a/lib/redux/recurring_invoice/recurring_invoice_actions.dart b/lib/redux/recurring_invoice/recurring_invoice_actions.dart
index 34ce11a26..70a13b4f9 100644
--- a/lib/redux/recurring_invoice/recurring_invoice_actions.dart
+++ b/lib/redux/recurring_invoice/recurring_invoice_actions.dart
@@ -543,7 +543,8 @@ void handleRecurringInvoiceAction(BuildContext context,
     case EntityAction.restore:
       final message = recurringInvoiceIds.length > 1
           ? localization.restoredRecurringInvoices
-              .replaceFirst(':value', recurringInvoiceIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', recurringInvoiceIds.length.toString())
           : localization.restoredRecurringInvoice;
       store.dispatch(RestoreRecurringInvoicesRequest(
           snackBarCompleter<Null>(context, message), recurringInvoiceIds));
@@ -551,7 +552,8 @@ void handleRecurringInvoiceAction(BuildContext context,
     case EntityAction.archive:
       final message = recurringInvoiceIds.length > 1
           ? localization.archivedRecurringInvoices
-              .replaceFirst(':value', recurringInvoiceIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', recurringInvoiceIds.length.toString())
           : localization.archivedRecurringInvoice;
       store.dispatch(ArchiveRecurringInvoicesRequest(
           snackBarCompleter<Null>(context, message), recurringInvoiceIds));
@@ -559,7 +561,8 @@ void handleRecurringInvoiceAction(BuildContext context,
     case EntityAction.delete:
       final message = recurringInvoiceIds.length > 1
           ? localization.deletedRecurringInvoices
-              .replaceFirst(':value', recurringInvoiceIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', recurringInvoiceIds.length.toString())
           : localization.deletedRecurringInvoice;
       store.dispatch(DeleteRecurringInvoicesRequest(
           snackBarCompleter<Null>(context, message), recurringInvoiceIds));
diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart
index aa9d3d5c4..3711d3381 100644
--- a/lib/redux/task/task_actions.dart
+++ b/lib/redux/task/task_actions.dart
@@ -367,7 +367,8 @@ void handleTaskAction(
     case EntityAction.resume:
       final message = taskIds.length > 1
           ? localization.startedTasks
-              .replaceFirst(':value', taskIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskIds.length.toString())
           : localization.startedTask;
       store.dispatch(StartTasksRequest(
           snackBarCompleter<Null>(context, message), taskIds));
@@ -375,7 +376,8 @@ void handleTaskAction(
     case EntityAction.stop:
       final message = taskIds.length > 1
           ? localization.stoppedTasks
-              .replaceFirst(':value', taskIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskIds.length.toString())
           : localization.stoppedTask;
       store.dispatch(
           StopTasksRequest(snackBarCompleter<Null>(context, message), taskIds));
@@ -472,7 +474,8 @@ void handleTaskAction(
     case EntityAction.restore:
       final message = taskIds.length > 1
           ? localization.restoredTasks
-              .replaceFirst(':value', taskIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskIds.length.toString())
           : localization.restoredTask;
       store.dispatch(RestoreTaskRequest(
           snackBarCompleter<Null>(context, message), taskIds));
@@ -480,7 +483,8 @@ void handleTaskAction(
     case EntityAction.archive:
       final message = taskIds.length > 1
           ? localization.archivedTasks
-              .replaceFirst(':value', taskIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskIds.length.toString())
           : localization.archivedTask;
       store.dispatch(ArchiveTaskRequest(
           snackBarCompleter<Null>(context, message), taskIds));
@@ -488,7 +492,8 @@ void handleTaskAction(
     case EntityAction.delete:
       final message = taskIds.length > 1
           ? localization.deletedTasks
-              .replaceFirst(':value', taskIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskIds.length.toString())
           : localization.deletedTask;
       store.dispatch(DeleteTaskRequest(
           snackBarCompleter<Null>(context, message), taskIds));
diff --git a/lib/redux/task_status/task_status_actions.dart b/lib/redux/task_status/task_status_actions.dart
index aeb19d811..8c93d867b 100644
--- a/lib/redux/task_status/task_status_actions.dart
+++ b/lib/redux/task_status/task_status_actions.dart
@@ -285,7 +285,8 @@ void handleTaskStatusAction(
     case EntityAction.restore:
       final message = taskStatusIds.length > 1
           ? localization.restoredTaskStatuses
-              .replaceFirst(':value', taskStatusIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskStatusIds.length.toString())
           : localization.restoredTaskStatus;
       store.dispatch(RestoreTaskStatusesRequest(
           snackBarCompleter<Null>(context, message), taskStatusIds));
@@ -293,7 +294,8 @@ void handleTaskStatusAction(
     case EntityAction.archive:
       final message = taskStatusIds.length > 1
           ? localization.archivedTaskStatuses
-              .replaceFirst(':value', taskStatusIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskStatusIds.length.toString())
           : localization.archivedTaskStatus;
       store.dispatch(ArchiveTaskStatusesRequest(
           snackBarCompleter<Null>(context, message), taskStatusIds));
@@ -301,7 +303,8 @@ void handleTaskStatusAction(
     case EntityAction.delete:
       final message = taskStatusIds.length > 1
           ? localization.deletedTaskStatuses
-              .replaceFirst(':value', taskStatusIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taskStatusIds.length.toString())
           : localization.deletedTaskStatus;
       store.dispatch(DeleteTaskStatusesRequest(
           snackBarCompleter<Null>(context, message), taskStatusIds));
diff --git a/lib/redux/tax_rate/tax_rate_actions.dart b/lib/redux/tax_rate/tax_rate_actions.dart
index 033bdfb2f..7f44982f5 100644
--- a/lib/redux/tax_rate/tax_rate_actions.dart
+++ b/lib/redux/tax_rate/tax_rate_actions.dart
@@ -232,7 +232,8 @@ void handleTaxRateAction(
     case EntityAction.restore:
       final message = taxRateIds.length > 1
           ? localization.restoredTaxRates
-              .replaceFirst(':value', taxRateIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taxRateIds.length.toString())
           : localization.restoredTaxRate;
       store.dispatch(RestoreTaxRateRequest(
           snackBarCompleter<Null>(context, message), taxRateIds));
@@ -240,7 +241,8 @@ void handleTaxRateAction(
     case EntityAction.archive:
       final message = taxRateIds.length > 1
           ? localization.archivedTaxRates
-              .replaceFirst(':value', taxRateIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taxRateIds.length.toString())
           : localization.archivedTaxRate;
       store.dispatch(ArchiveTaxRateRequest(
           snackBarCompleter<Null>(context, message), taxRateIds));
@@ -248,7 +250,8 @@ void handleTaxRateAction(
     case EntityAction.delete:
       final message = taxRateIds.length > 1
           ? localization.deletedTaxRates
-              .replaceFirst(':value', taxRateIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', taxRateIds.length.toString())
           : localization.deletedTaxRate;
       store.dispatch(DeleteTaxRateRequest(
           snackBarCompleter<Null>(context, message), taxRateIds));
diff --git a/lib/redux/token/token_actions.dart b/lib/redux/token/token_actions.dart
index 0b537804c..a2bc6227e 100644
--- a/lib/redux/token/token_actions.dart
+++ b/lib/redux/token/token_actions.dart
@@ -280,7 +280,8 @@ void handleTokenAction(
     case EntityAction.restore:
       final message = tokenIds.length > 1
           ? localization.restoredTokens
-              .replaceFirst(':value', tokenIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', tokenIds.length.toString())
           : localization.restoredToken;
       store.dispatch(RestoreTokensRequest(
           snackBarCompleter<Null>(context, message), tokenIds));
@@ -288,7 +289,8 @@ void handleTokenAction(
     case EntityAction.archive:
       final message = tokenIds.length > 1
           ? localization.archivedTokens
-              .replaceFirst(':value', tokenIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', tokenIds.length.toString())
           : localization.archivedToken;
       store.dispatch(ArchiveTokensRequest(
           snackBarCompleter<Null>(context, message), tokenIds));
@@ -296,7 +298,8 @@ void handleTokenAction(
     case EntityAction.delete:
       final message = tokenIds.length > 1
           ? localization.deletedTokens
-              .replaceFirst(':value', tokenIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', tokenIds.length.toString())
           : localization.deletedToken;
       store.dispatch(DeleteTokensRequest(
           snackBarCompleter<Null>(context, message), tokenIds));
diff --git a/lib/redux/user/user_actions.dart b/lib/redux/user/user_actions.dart
index 33cbb4081..7b07f6443 100644
--- a/lib/redux/user/user_actions.dart
+++ b/lib/redux/user/user_actions.dart
@@ -423,7 +423,8 @@ void handleUserAction(
     case EntityAction.restore:
       final message = userIds.length > 1
           ? localization.restoredUsers
-              .replaceFirst(':value', userIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', userIds.length.toString())
           : localization.restoredUser;
       final dispatch = ([String password, String idToken]) =>
           store.dispatch(RestoreUserRequest(
@@ -441,7 +442,8 @@ void handleUserAction(
     case EntityAction.archive:
       final message = userIds.length > 1
           ? localization.archivedUsers
-              .replaceFirst(':value', userIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', userIds.length.toString())
           : localization.archivedUser;
       final dispatch = ([String password, String idToken]) =>
           store.dispatch(ArchiveUserRequest(
@@ -459,7 +461,8 @@ void handleUserAction(
     case EntityAction.delete:
       final message = userIds.length > 1
           ? localization.deletedUsers
-              .replaceFirst(':value', userIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', userIds.length.toString())
           : localization.deletedUser;
       final dispatch = ([
         String password,
@@ -488,7 +491,8 @@ void handleUserAction(
     case EntityAction.remove:
       final message = userIds.length > 1
           ? localization.removedUsers
-              .replaceFirst(':value', userIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', userIds.length.toString())
           : localization.removedUser;
       final dispatch = ([
         String password,
diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart
index 7ddf0af05..8406fecae 100644
--- a/lib/redux/vendor/vendor_actions.dart
+++ b/lib/redux/vendor/vendor_actions.dart
@@ -325,7 +325,8 @@ void handleVendorAction(
     case EntityAction.restore:
       final message = vendorIds.length > 1
           ? localization.restoredVendors
-              .replaceFirst(':value', vendorIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', vendorIds.length.toString())
           : localization.restoredVendor;
       store.dispatch(RestoreVendorRequest(
           snackBarCompleter<Null>(context, message), vendorIds));
@@ -333,7 +334,8 @@ void handleVendorAction(
     case EntityAction.archive:
       final message = vendorIds.length > 1
           ? localization.archivedVendors
-              .replaceFirst(':value', vendorIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', vendorIds.length.toString())
           : localization.archivedVendor;
       store.dispatch(ArchiveVendorRequest(
           snackBarCompleter<Null>(context, message), vendorIds));
@@ -341,7 +343,8 @@ void handleVendorAction(
     case EntityAction.delete:
       final message = vendorIds.length > 1
           ? localization.deletedVendors
-              .replaceFirst(':value', vendorIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', vendorIds.length.toString())
           : localization.deletedVendor;
       store.dispatch(DeleteVendorRequest(
           snackBarCompleter<Null>(context, message), vendorIds));
diff --git a/lib/redux/webhook/webhook_actions.dart b/lib/redux/webhook/webhook_actions.dart
index b1fc3649c..50ab02cc5 100644
--- a/lib/redux/webhook/webhook_actions.dart
+++ b/lib/redux/webhook/webhook_actions.dart
@@ -270,7 +270,8 @@ void handleWebhookAction(
     case EntityAction.restore:
       final message = webhookIds.length > 1
           ? localization.restoredWebhooks
-              .replaceFirst(':value', webhookIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', webhookIds.length.toString())
           : localization.restoredWebhook;
       store.dispatch(RestoreWebhooksRequest(
           snackBarCompleter<Null>(context, message), webhookIds));
@@ -278,7 +279,8 @@ void handleWebhookAction(
     case EntityAction.archive:
       final message = webhookIds.length > 1
           ? localization.archivedWebhooks
-              .replaceFirst(':value', webhookIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', webhookIds.length.toString())
           : localization.archivedWebhook;
       store.dispatch(ArchiveWebhooksRequest(
           snackBarCompleter<Null>(context, message), webhookIds));
@@ -286,7 +288,8 @@ void handleWebhookAction(
     case EntityAction.delete:
       final message = webhookIds.length > 1
           ? localization.deletedWebhooks
-              .replaceFirst(':value', webhookIds.length.toString())
+              .replaceFirst(':value', ':count')
+              .replaceFirst(':count', webhookIds.length.toString())
           : localization.deletedWebhook;
       store.dispatch(DeleteWebhooksRequest(
           snackBarCompleter<Null>(context, message), webhookIds));
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 7ed6db18b..c255b6203 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -16,6 +16,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
   static final Map<String, Map<String, String>> _localizedValues = {
     'en': {
       // STARTER: lang key - do not remove comment
+      'action_add_to_invoice': 'Add To Invoice',
       'online_payment_email_help':
           'Send an email when an online payment is made',
       'manual_payment_email_help':