diff --git a/lib/ui/app/invoice/invoice_email_view.dart b/lib/ui/app/invoice/invoice_email_view.dart
index 88200b357..6d9d2fee6 100644
--- a/lib/ui/app/invoice/invoice_email_view.dart
+++ b/lib/ui/app/invoice/invoice_email_view.dart
@@ -2,6 +2,7 @@ import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
+import 'package:invoiceninja_flutter/ui/app/forms/app_tab_bar.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
 import 'package:invoiceninja_flutter/ui/app/help_text.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/activity_list_tile.dart';
@@ -297,7 +298,7 @@ class _InvoiceEmailViewState extends State<InvoiceEmailView>
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    TabBar(
+                    AppTabBar(
                       tabs: [
                         Tab(
                           child: Text(localization.customize),
diff --git a/lib/ui/app/variables.dart b/lib/ui/app/variables.dart
index 1931e7fad..18d10c94f 100644
--- a/lib/ui/app/variables.dart
+++ b/lib/ui/app/variables.dart
@@ -8,6 +8,7 @@ import 'package:invoiceninja_flutter/data/models/invoice_model.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
+import 'package:invoiceninja_flutter/ui/app/forms/app_tab_bar.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 
 class VariablesHelp extends StatefulWidget {
@@ -45,7 +46,7 @@ class _VariablesHelpState extends State<VariablesHelp>
 
     return FormCard(
       children: [
-        TabBar(
+        AppTabBar(
           controller: _controller,
           isScrollable: true,
           tabs: [