diff --git a/lib/ui/app/buttons/elevated_button.dart b/lib/ui/app/buttons/elevated_button.dart
index cd585f3c6..32099a37c 100644
--- a/lib/ui/app/buttons/elevated_button.dart
+++ b/lib/ui/app/buttons/elevated_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/ui/app/icon_text.dart';
 
-class ElevatedButton extends StatelessWidget {
-  const ElevatedButton({
+class AppButton extends StatelessWidget {
+  const AppButton({
     @required this.label,
     @required this.onPressed,
     this.iconData,
diff --git a/lib/ui/app/document_grid.dart b/lib/ui/app/document_grid.dart
index b17dcbf7b..a807dd2ee 100644
--- a/lib/ui/app/document_grid.dart
+++ b/lib/ui/app/document_grid.dart
@@ -42,7 +42,7 @@ class DocumentGrid extends StatelessWidget {
               children: <Widget>[
                 if (!kIsWeb)
                   Expanded(
-                    child: ElevatedButton(
+                    child: AppButton(
                       iconData: Icons.camera_alt,
                       label: localization.takePicture,
                       onPressed: () async {
@@ -59,7 +59,7 @@ class DocumentGrid extends StatelessWidget {
                     width: 14,
                   ),
                 Expanded(
-                  child: ElevatedButton(
+                  child: AppButton(
                     iconData: Icons.insert_drive_file,
                     label: localization.uploadFile,
                     onPressed: () async {
diff --git a/lib/ui/app/forms/date_range_picker.dart b/lib/ui/app/forms/date_range_picker.dart
index 613aa7014..d98f117bd 100644
--- a/lib/ui/app/forms/date_range_picker.dart
+++ b/lib/ui/app/forms/date_range_picker.dart
@@ -151,7 +151,7 @@ class _DateRangePickerState extends State<DateRangePicker> {
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: <Widget>[
-                        ElevatedButton(
+                        AppButton(
                           label: localization.done,
                           onPressed: () {
                             // TODO replace with form validation
diff --git a/lib/ui/app/progress_button.dart b/lib/ui/app/progress_button.dart
index 9f18c77bb..d4c7b1826 100644
--- a/lib/ui/app/progress_button.dart
+++ b/lib/ui/app/progress_button.dart
@@ -25,7 +25,7 @@ class ProgressButton extends StatelessWidget {
               child: CircularProgressIndicator(),
             ),
           )
-        : ElevatedButton(
+        : AppButton(
             width: double.infinity,
             label: label,
             onPressed: () => onPressed(),
diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart
index 634704c2d..8797cdced 100644
--- a/lib/ui/app/upgrade_dialog.dart
+++ b/lib/ui/app/upgrade_dialog.dart
@@ -224,7 +224,7 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
                 onTap: () => redeemPurchase(purchase),
               )),
         if (_purchases != null)
-          ElevatedButton(
+          AppButton(
             label: _showPastPurchases
                 ? localization.back
                 : localization.pastPurchases,
diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart
index cd33c33f2..604a01778 100644
--- a/lib/ui/auth/login_view.dart
+++ b/lib/ui/auth/login_view.dart
@@ -649,7 +649,7 @@ class _LoginState extends State<LoginView> {
                     if (isOneTimePassword && !viewModel.isLoading)
                       Padding(
                         padding: EdgeInsets.only(top: 12.0, bottom: 12.0),
-                        child: ElevatedButton(
+                        child: AppButton(
                           label: localization.cancel.toUpperCase(),
                           color: Colors.grey,
                           onPressed: () {
diff --git a/lib/ui/client/edit/client_edit_billing_address.dart b/lib/ui/client/edit/client_edit_billing_address.dart
index e87323b1d..1c43c9afa 100644
--- a/lib/ui/client/edit/client_edit_billing_address.dart
+++ b/lib/ui/client/edit/client_edit_billing_address.dart
@@ -130,7 +130,7 @@ class ClientEditBillingAddressState extends State<ClientEditBillingAddress> {
       client.hasShippingAddress && client.areAddressesDifferent
           ? Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: ElevatedButton(
+              child: AppButton(
                 label: localization.copyShipping.toUpperCase(),
                 onPressed: () {
                   viewModel.copyShippingAddress();
diff --git a/lib/ui/client/edit/client_edit_contacts.dart b/lib/ui/client/edit/client_edit_contacts.dart
index 355072616..7fc823b82 100644
--- a/lib/ui/client/edit/client_edit_contacts.dart
+++ b/lib/ui/client/edit/client_edit_contacts.dart
@@ -89,7 +89,7 @@ class _ClientEditContactsState extends State<ClientEditContacts> {
         ..addAll(contacts)
         ..add(Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16.0),
-          child: ElevatedButton(
+          child: AppButton(
             label: localization.addContact.toUpperCase(),
             onPressed: () => viewModel.onAddContactPressed(),
           ),
@@ -256,7 +256,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
                       Expanded(
                         child: Container(),
                       ),
-                      ElevatedButton(
+                      AppButton(
                         color: Colors.red,
                         iconData: Icons.delete,
                         label: localization.remove,
@@ -271,7 +271,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
                       SizedBox(
                         width: 10.0,
                       ),
-                      ElevatedButton(
+                      AppButton(
                         iconData: Icons.check_circle,
                         label: localization.done,
                         onPressed: () {
diff --git a/lib/ui/client/edit/client_edit_shipping_address.dart b/lib/ui/client/edit/client_edit_shipping_address.dart
index 43e9b32ec..fbb7da427 100644
--- a/lib/ui/client/edit/client_edit_shipping_address.dart
+++ b/lib/ui/client/edit/client_edit_shipping_address.dart
@@ -127,7 +127,7 @@ class ClientEditShippingAddressState extends State<ClientEditShippingAddress> {
       client.hasBillingAddress && client.areAddressesDifferent
           ? Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: ElevatedButton(
+              child: AppButton(
                 label: localization.copyBilling.toUpperCase(),
                 onPressed: () {
                   viewModel.copyBillingAddress();
diff --git a/lib/ui/group/view/group_view.dart b/lib/ui/group/view/group_view.dart
index f2edcdbe1..2d92273bb 100644
--- a/lib/ui/group/view/group_view.dart
+++ b/lib/ui/group/view/group_view.dart
@@ -46,7 +46,7 @@ class _GroupViewState extends State<GroupView> {
         children: <Widget>[
           Padding(
             padding: const EdgeInsets.all(16),
-            child: ElevatedButton(
+            child: AppButton(
               label: localization.configureSettings.toUpperCase(),
               iconData: Icons.settings,
               onPressed: () =>
diff --git a/lib/ui/invoice/edit/invoice_edit_items.dart b/lib/ui/invoice/edit/invoice_edit_items.dart
index f71e337c3..8153c16ec 100644
--- a/lib/ui/invoice/edit/invoice_edit_items.dart
+++ b/lib/ui/invoice/edit/invoice_edit_items.dart
@@ -208,7 +208,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
               mainAxisAlignment: MainAxisAlignment.end,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: <Widget>[
-                ElevatedButton(
+                AppButton(
                   color: Colors.red,
                   iconData: Icons.delete,
                   label: localization.remove,
@@ -220,7 +220,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
                 SizedBox(
                   width: 10.0,
                 ),
-                ElevatedButton(
+                AppButton(
                   iconData: Icons.check_circle,
                   label: localization.done,
                   onPressed: () {
diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index 2acef24ca..e0ff10151 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -285,7 +285,7 @@ class ReportsScreen extends StatelessWidget {
                   children: [
                     Builder(builder: (BuildContext context) {
                       return Expanded(
-                        child: ElevatedButton(
+                        child: AppButton(
                           label: localization.columns,
                           onPressed: () {
                             multiselectDialog(
@@ -304,7 +304,7 @@ class ReportsScreen extends StatelessWidget {
                     }),
                     SizedBox(width: kGutterWidth),
                     Expanded(
-                      child: ElevatedButton(
+                      child: AppButton(
                         label: localization.export,
                         onPressed: () {
                           viewModel.onExportPressed(context);
diff --git a/lib/ui/settings/account_management.dart b/lib/ui/settings/account_management.dart
index 3b8a585be..c027791c7 100644
--- a/lib/ui/settings/account_management.dart
+++ b/lib/ui/settings/account_management.dart
@@ -132,7 +132,7 @@ class _AccountOverview extends StatelessWidget {
         SizedBox(height: 14),
         Padding(
           padding: const EdgeInsets.all(16),
-          child: ElevatedButton(
+          child: AppButton(
             label: localization.manageTokens.toUpperCase(),
             iconData: getEntityIcon(EntityType.token),
             onPressed: () {
@@ -145,7 +145,7 @@ class _AccountOverview extends StatelessWidget {
         ),
         Padding(
           padding: const EdgeInsets.all(16),
-          child: ElevatedButton(
+          child: AppButton(
             label: localization.manageWebhooks.toUpperCase(),
             iconData: getEntityIcon(EntityType.webhook),
             onPressed: () {
@@ -185,7 +185,7 @@ class _AccountOverview extends StatelessWidget {
                */
         Padding(
           padding: const EdgeInsets.all(16),
-          child: ElevatedButton(
+          child: AppButton(
             label: localization.purchaseLicense.toUpperCase(),
             iconData: Icons.cloud_download,
             onPressed: () async {
@@ -197,7 +197,7 @@ class _AccountOverview extends StatelessWidget {
         ),
         Padding(
           padding: const EdgeInsets.all(16),
-          child: ElevatedButton(
+          child: AppButton(
             label: localization.applyLicense.toUpperCase(),
             iconData: Icons.cloud_done,
             onPressed: () {
@@ -231,7 +231,7 @@ class _AccountOverview extends StatelessWidget {
         ),
         Padding(
           padding: const EdgeInsets.all(16),
-          child: ElevatedButton(
+          child: AppButton(
             label: companies.length == 1
                 ? localization.cancelAccount.toUpperCase()
                 : localization.deleteCompany.toUpperCase(),
diff --git a/lib/ui/settings/company_details.dart b/lib/ui/settings/company_details.dart
index f26a33624..0fdea937c 100644
--- a/lib/ui/settings/company_details.dart
+++ b/lib/ui/settings/company_details.dart
@@ -327,7 +327,7 @@ class _CompanyDetailsState extends State<CompanyDetails>
                       children: <Widget>[
                         if ('${settings.companyLogo ?? ''}'.isNotEmpty) ...[
                           Expanded(
-                            child: ElevatedButton(
+                            child: AppButton(
                               width: double.infinity,
                               color: Colors.redAccent,
                               label: localization.delete,
@@ -343,7 +343,7 @@ class _CompanyDetailsState extends State<CompanyDetails>
                           SizedBox(width: 20),
                         ],
                         Expanded(
-                          child: ElevatedButton(
+                          child: AppButton(
                             width: double.infinity,
                             label: localization.uploadLogo,
                             iconData: Icons.cloud_upload,
@@ -475,7 +475,7 @@ class _CompanyDetailsState extends State<CompanyDetails>
                   if (!state.uiState.settingsUIState.isFiltered)
                     Padding(
                       padding: const EdgeInsets.only(top: 25, bottom: 10),
-                      child: ElevatedButton(
+                      child: AppButton(
                         iconData: Icons.settings,
                         label: localization.configurePaymentTerms.toUpperCase(),
                         onPressed: () =>
diff --git a/lib/ui/settings/invoice_design.dart b/lib/ui/settings/invoice_design.dart
index b9a8e283c..dbd0d40e1 100644
--- a/lib/ui/settings/invoice_design.dart
+++ b/lib/ui/settings/invoice_design.dart
@@ -115,7 +115,7 @@ class _InvoiceDesignState extends State<InvoiceDesign>
               Padding(
                 padding: const EdgeInsets.only(
                     top: 20, right: 16, bottom: 10, left: 16),
-                child: ElevatedButton(
+                child: AppButton(
                   label: localization.customizeAndPreview.toUpperCase(),
                   iconData: Icons.settings,
                   onPressed: () => state.designState.customDesigns.isEmpty
diff --git a/lib/ui/settings/tax_settings.dart b/lib/ui/settings/tax_settings.dart
index 2c335f644..985243829 100644
--- a/lib/ui/settings/tax_settings.dart
+++ b/lib/ui/settings/tax_settings.dart
@@ -119,7 +119,7 @@ class _TaxSettingsState extends State<TaxSettings> {
           if (!state.uiState.settingsUIState.isFiltered)
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: ElevatedButton(
+              child: AppButton(
                 iconData: Icons.settings,
                 label: localization.configureRates.toUpperCase(),
                 onPressed: () => viewModel.onConfigureRatesPressed(context),
diff --git a/lib/ui/task/edit/task_edit_times.dart b/lib/ui/task/edit/task_edit_times.dart
index 27741f86c..d1df10895 100644
--- a/lib/ui/task/edit/task_edit_times.dart
+++ b/lib/ui/task/edit/task_edit_times.dart
@@ -142,7 +142,7 @@ class TimeEditDetailsState extends State<TimeEditDetails> {
               mainAxisAlignment: MainAxisAlignment.end,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: <Widget>[
-                ElevatedButton(
+                AppButton(
                   color: Colors.red,
                   iconData: Icons.delete,
                   label: localization.remove,
@@ -154,7 +154,7 @@ class TimeEditDetailsState extends State<TimeEditDetails> {
                 SizedBox(
                   width: 10.0,
                 ),
-                ElevatedButton(
+                AppButton(
                   iconData: Icons.check_circle,
                   label: localization.done,
                   onPressed: () {
diff --git a/lib/ui/vendor/edit/vendor_edit_contacts.dart b/lib/ui/vendor/edit/vendor_edit_contacts.dart
index d9c061983..37c86fdb2 100644
--- a/lib/ui/vendor/edit/vendor_edit_contacts.dart
+++ b/lib/ui/vendor/edit/vendor_edit_contacts.dart
@@ -85,7 +85,7 @@ class _VendorEditContactsState extends State<VendorEditContacts> {
         ..addAll(contacts)
         ..add(Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16.0),
-          child: ElevatedButton(
+          child: AppButton(
             label: localization.addContact.toUpperCase(),
             onPressed: () => viewModel.onAddContactPressed(),
           ),
@@ -233,7 +233,7 @@ class VendorContactEditDetailsState extends State<VendorContactEditDetails> {
                       Expanded(
                         child: Container(),
                       ),
-                      ElevatedButton(
+                      AppButton(
                         color: Colors.red,
                         iconData: Icons.delete,
                         label: localization.remove,
@@ -248,7 +248,7 @@ class VendorContactEditDetailsState extends State<VendorContactEditDetails> {
                       SizedBox(
                         width: 10.0,
                       ),
-                      ElevatedButton(
+                      AppButton(
                         iconData: Icons.check_circle,
                         label: localization.done,
                         onPressed: () {