diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 5ef22df75..c7687555f 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -603,11 +603,11 @@ abstract class TaskEntity extends Object
         if (userCompany.canEditEntity(this)) {
           actions.add(EntityAction.changeStatus);
         }
+      }
 
-        if (!isInvoiced && !isRunning) {
-          if (userCompany.canCreate(EntityType.invoice)) {
-            actions.add(EntityAction.invoiceTask);
-          }
+      if (!isInvoiced && !isRunning) {
+        if (userCompany.canCreate(EntityType.invoice)) {
+          actions.add(EntityAction.invoiceTask);
         }
       }
     }
diff --git a/lib/ui/client/client_pdf.dart b/lib/ui/client/client_pdf.dart
index c06ce9ecd..341059c1f 100644
--- a/lib/ui/client/client_pdf.dart
+++ b/lib/ui/client/client_pdf.dart
@@ -20,7 +20,6 @@ import 'package:printing/printing.dart';
 import 'package:share/share.dart';
 
 // Project imports:
-import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/dashboard_model.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/data/web_client.dart';
diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart
index 2a874a18d..c602d7a8e 100644
--- a/lib/ui/invoice/edit/invoice_edit_desktop.dart
+++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart
@@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart';
 import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart';
-import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:http/http.dart' as http;
 
 // Project imports:
@@ -23,7 +22,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/client/client_selectors.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart';
 import 'package:invoiceninja_flutter/ui/app/app_scrollbar.dart';
-import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_tab_bar.dart';
@@ -1000,7 +998,7 @@ class __PdfPreviewState extends State<_PdfPreview> {
 
   @override
   Widget build(BuildContext context) {
-    final localization = AppLocalization.of(context);
+    //final localization = AppLocalization.of(context);
 
     return Container(
       height: 1200,