diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart
index 34fafae9b..bf36064a9 100644
--- a/lib/data/models/company_model.dart
+++ b/lib/data/models/company_model.dart
@@ -1988,7 +1988,6 @@ abstract class SettingsEntity
 
   bool doesPdfHaveField(String section, String field) {
     final fields = getFieldsForSection(section);
-    print('## FIELDs: $fields');
     return fields.contains(field);
   }
 
diff --git a/lib/ui/app/forms/app_dropdown_button.dart b/lib/ui/app/forms/app_dropdown_button.dart
index e82a2b807..6c70f0b3a 100644
--- a/lib/ui/app/forms/app_dropdown_button.dart
+++ b/lib/ui/app/forms/app_dropdown_button.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
@@ -61,7 +60,6 @@ class AppDropdownButton<T> extends StatelessWidget {
       dropDownButton = InputDecorator(
           decoration: InputDecoration(
             labelText: labelText,
-            contentPadding: EdgeInsets.only(right: 10, top: 12, bottom: 12),
           ),
           isEmpty: isEmpty,
           child: dropDownButton);
diff --git a/lib/ui/app/forms/discount_field.dart b/lib/ui/app/forms/discount_field.dart
index ac8cfe0de..ee01c2fa2 100644
--- a/lib/ui/app/forms/discount_field.dart
+++ b/lib/ui/app/forms/discount_field.dart
@@ -59,7 +59,6 @@ class DiscountField extends StatelessWidget {
             onChanged: onTypeChanged,
           ),
         ),
-        SizedBox(width: 12),
       ],
     );
   }
diff --git a/lib/ui/app/invoice/tax_rate_dropdown.dart b/lib/ui/app/invoice/tax_rate_dropdown.dart
index 15358beff..8e1dd86bf 100644
--- a/lib/ui/app/invoice/tax_rate_dropdown.dart
+++ b/lib/ui/app/invoice/tax_rate_dropdown.dart
@@ -74,7 +74,6 @@ class _TaxRateDropdownState extends State<TaxRateDropdown> {
 
     return InputDecorator(
       decoration: InputDecoration(
-        contentPadding: EdgeInsets.only(right: 10, top: 12, bottom: 12),
         labelText: widget.labelText,
       ),
       isEmpty: taxRate == null || taxRate.isEmpty,
diff --git a/lib/ui/app/tables/entity_list.dart b/lib/ui/app/tables/entity_list.dart
index cb575163c..b0e8a829b 100644
--- a/lib/ui/app/tables/entity_list.dart
+++ b/lib/ui/app/tables/entity_list.dart
@@ -160,7 +160,7 @@ class _EntityListState extends State<EntityList> {
                       scrollbarTimeToFade: Duration(seconds: 1),
                       controller: _scrollController,
                       child: ListView.separated(
-                        padding: const EdgeInsets.symmetric(vertical: 20),
+                        padding: const EdgeInsets.symmetric(vertical: 25),
                         controller: _scrollController,
                         separatorBuilder: (context, index) =>
                             (index == 0 || index == entityList.length)