diff --git a/lib/ui/app/app_bottom_bar.dart b/lib/ui/app/app_bottom_bar.dart
index fe87f2d81..b482d0066 100644
--- a/lib/ui/app/app_bottom_bar.dart
+++ b/lib/ui/app/app_bottom_bar.dart
@@ -493,14 +493,15 @@ class _AppBottomBarState extends State<AppBottomBar> {
                       tooltip: localization.columns,
                       onPressed: _onColumnsPressed,
                     ),
-                AppBorder(
-                  isLeft: state.prefState.isDesktop,
-                  child: IconButton(
-                    icon: Icon(Icons.refresh),
-                    onPressed: () => store.dispatch(RefreshData()),
-                    tooltip: localization.refresh,
+                if (state.prefState.isDesktop)
+                  AppBorder(
+                    isLeft: true,
+                    child: IconButton(
+                      icon: Icon(Icons.refresh),
+                      onPressed: () => store.dispatch(RefreshData()),
+                      tooltip: localization.refresh,
+                    ),
                   ),
-                ),
               ],
             ),
           ),
diff --git a/lib/ui/company_gateway/edit/company_gateway_edit.dart b/lib/ui/company_gateway/edit/company_gateway_edit.dart
index 2963cb581..2f1b6a6c2 100644
--- a/lib/ui/company_gateway/edit/company_gateway_edit.dart
+++ b/lib/ui/company_gateway/edit/company_gateway_edit.dart
@@ -777,14 +777,20 @@ class _FeesEditorState extends State<FeesEditor> {
         DecoratedFormField(
           label: localization.feeAmount,
           controller: _amountController,
+          autocorrect: false,
+          keyboardType: TextInputType.numberWithOptions(decimal: true),
         ),
         DecoratedFormField(
           label: localization.feePercent,
           controller: _percentController,
+          autocorrect: false,
+          keyboardType: TextInputType.numberWithOptions(decimal: true),
         ),
         DecoratedFormField(
           label: localization.feeCap,
           controller: _capController,
+          autocorrect: false,
+          keyboardType: TextInputType.numberWithOptions(decimal: true),
         ),
         if (company.enableFirstItemTaxRate)
           TaxRateDropdown(
diff --git a/lib/ui/payment/edit/payment_edit.dart b/lib/ui/payment/edit/payment_edit.dart
index 6a59692a7..c94719daa 100644
--- a/lib/ui/payment/edit/payment_edit.dart
+++ b/lib/ui/payment/edit/payment_edit.dart
@@ -522,6 +522,8 @@ class _PaymentableEditorState extends State<PaymentableEditor> {
           Expanded(
             child: DecoratedFormField(
               controller: _amountController,
+              autocorrect: false,
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
               label: payment.isForInvoice == true
                   ? localization.amount
                   : localization.applied,
diff --git a/lib/ui/payment/refund/payment_refund.dart b/lib/ui/payment/refund/payment_refund.dart
index 5e223b8a8..83d23b8b2 100644
--- a/lib/ui/payment/refund/payment_refund.dart
+++ b/lib/ui/payment/refund/payment_refund.dart
@@ -349,6 +349,8 @@ class _PaymentableEditorState extends State<PaymentableEditor> {
             child: DecoratedFormField(
               enabled: (_invoiceId ?? '').isNotEmpty,
               controller: _amountController,
+              autocorrect: false,
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
               label: localization.amount,
               autofocus: !hasMultipleInvoices,
               validator: (value) => !hasMultipleInvoices &&
diff --git a/lib/ui/vendor/edit/vendor_edit.dart b/lib/ui/vendor/edit/vendor_edit.dart
index a7223e399..954e6a6ad 100644
--- a/lib/ui/vendor/edit/vendor_edit.dart
+++ b/lib/ui/vendor/edit/vendor_edit.dart
@@ -7,6 +7,7 @@ import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_details.dart';
 import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_notes.dart';
 import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class VendorEdit extends StatefulWidget {
   const VendorEdit({
@@ -65,7 +66,7 @@ class _VendorEditState extends State<VendorEdit>
       },
       appBarBottom: TabBar(
         controller: _controller,
-        //isScrollable: true,
+        isScrollable: isMobile(context),
         tabs: [
           Tab(
             text: localization.details,