diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 733ab575ccba..9b39f64d3774 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -500,7 +500,7 @@ class AccountController extends BaseController
                 'title' => trans('texts.online_payments'),
                 'tokenBillingOptions' => $tokenBillingOptions,
                 'currency' => Utils::getFromCache(Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY), 'currencies'),
-                'taxRates' => TaxRate::scope()->whereIsInclusive(false)->get(['id', 'name', 'rate']),
+                'taxRates' => TaxRate::scope()->whereIsInclusive(false)->orderBy('rate')->get(['public_id', 'name', 'rate']),
                 'account' => $account,
             ]);
         }
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 6d5c3ca90346..431e9bd118b3 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -189,6 +189,14 @@ class Account extends Eloquent
         return $this->hasMany('App\Models\AccountGateway');
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function account_gateway_settings()
+    {
+        return $this->hasMany('App\Models\AccountGatewaySettings');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
diff --git a/app/Ninja/Datatables/AccountGatewayDatatable.php b/app/Ninja/Datatables/AccountGatewayDatatable.php
index bf274eb40af4..814ace071cc9 100644
--- a/app/Ninja/Datatables/AccountGatewayDatatable.php
+++ b/app/Ninja/Datatables/AccountGatewayDatatable.php
@@ -171,10 +171,9 @@ class AccountGatewayDatatable extends EntityDatatable
                     $accountGatewaySettings = AccountGatewaySettings::scope()
                         ->where('account_gateway_settings.gateway_type_id', '=', $gatewayType->id)
                         ->first();
-                    $min = $accountGatewaySettings && $accountGatewaySettings->min_limit !== null ? $accountGatewaySettings->min_limit : 'null';
-                    $max = $accountGatewaySettings && $accountGatewaySettings->max_limit !== null ? $accountGatewaySettings->max_limit : 'null';
-
-                    return "javascript:showLimitsModal('{$gatewayType->name}', {$gatewayType->id}, $min, $max)";
+                    //$min = $accountGatewaySettings && $accountGatewaySettings->min_limit !== null ? $accountGatewaySettings->min_limit : 'null';
+                    //$max = $accountGatewaySettings && $accountGatewaySettings->max_limit !== null ? $accountGatewaySettings->max_limit : 'null';
+                    return "javascript:showLimitsModal('{$gatewayType->name}', {$gatewayType->id})";
                 },
                 function ($model) use ($gatewayType) {
                     // Only show this action if the given gateway supports this gateway type
diff --git a/docs/configure.rst b/docs/configure.rst
index c79f221092be..652294ffd92f 100644
--- a/docs/configure.rst
+++ b/docs/configure.rst
@@ -64,7 +64,7 @@ You can install PhantomJS to generate the PDF locally, to enable it add ``PHANTO
 Custom Fonts
 """"""""""""
 
-Follow these steps to add custom ttf fonts: ie, Google fonts
+Follow these steps to add custom ttf fonts: ie, `Google fonts <https://www.google.com/get/noto/>`_
 
 - Create a new folder in ``public/fonts/invoice-fonts/`` and copy over the ttf files
 - Run ``grunt dump_dir``
diff --git a/resources/views/accounts/payments.blade.php b/resources/views/accounts/payments.blade.php
index 5d94bf49f56d..09702c5f1c7c 100644
--- a/resources/views/accounts/payments.blade.php
+++ b/resources/views/accounts/payments.blade.php
@@ -117,7 +117,7 @@
 
 		                    </div>
 		                </div>
-						<div role="tabpanel" class="tab-pane active" id="fees">
+						<div role="tabpanel" class="tab-pane" id="fees">
 		                    <div class="panel-body">
 
 								{!! Former::text('fee_amount')
@@ -138,23 +138,24 @@
 										  ->onchange('onTaxRateChange(1)')
 							              ->addOption('', '')
 							              ->label(trans('texts.tax_rate'))
-							              ->fromQuery($taxRates, function($model) { return $model->name . ' ' . $model->rate . '%'; }, 'id') !!}
-
-									{!! Former::text('fee_tax_name1') !!}
-									{!! Former::text('fee_tax_rate1') !!}
+							              ->fromQuery($taxRates, function($model) { return $model->name . ' ' . $model->rate . '%'; }, 'public_id') !!}
 
 									@if ($account->enable_second_tax_rate)
 									{!! Former::select('tax_rate2')
 										  ->onchange('onTaxRateChange(2)')
 							              ->addOption('', '')
 							              ->label(trans('texts.tax_rate'))
-							              ->fromQuery($taxRates, function($model) { return $model->name . ' ' . $model->rate . '%'; }, 'id') !!}
+							              ->fromQuery($taxRates, function($model) { return $model->name . ' ' . $model->rate . '%'; }, 'public_id') !!}
 									@endif
 
+								@endif
+
+								<div style="display:none">
+									{!! Former::text('fee_tax_name1') !!}
+									{!! Former::text('fee_tax_rate1') !!}
 									{!! Former::text('fee_tax_name2') !!}
 									{!! Former::text('fee_tax_rate2') !!}
-
-								@endif
+								</div>
 
 								<br/><div id="feeSample" class="help-block"></div>
 
@@ -185,14 +186,26 @@
     window.onDatatableReady = actionListHandler;
 
 	var taxRates = {!! $taxRates !!};
+	var taxRatesMap = {};
+	for (var i=0; i<taxRates.length; i++) {
+		var taxRate = taxRates[i];
+		taxRatesMap[taxRate.public_id] = taxRate;
+	}
+	var gatewaySettings = {};
 
-    function showLimitsModal(gateway_type, gateway_type_id, min_limit, max_limit) {
+	@foreach ($account->account_gateway_settings as $setting)
+		gatewaySettings[{{ $setting->gateway_type_id }}] = {!! $setting !!};
+	@endforeach
+
+    //function showLimitsModal(gateway_type, gateway_type_id, min_limit, max_limit, fee_amount, fee_percent, fee_tax_name1, fee_tax_rate1, fee_tax_name2, fee_tax_rate2) {
+	function showLimitsModal(gateway_type, gateway_type_id) {
+		var settings = gatewaySettings[gateway_type_id];
         var modalLabel = {!! json_encode(trans('texts.set_limits_fees')) !!};
         $('#paymentLimitsModalLabel').text(modalLabel.replace(':gateway_type', gateway_type));
 
-        limitsSlider.noUiSlider.set([min_limit !== null ? min_limit : 0, max_limit !== null ? max_limit : 100000]);
+        limitsSlider.noUiSlider.set([settings.min_limit !== null ? settings.min_limit : 0, settings.max_limit !== null ? settings.max_limit : 100000]);
 
-        if (min_limit !== null) {
+        if (settings.min_limit !== null) {
             $('#payment-limit-min').removeAttr('disabled');
             $('#payment-limit-min-enable').prop('checked', true);
         } else {
@@ -200,7 +213,7 @@
             $('#payment-limit-min-enable').prop('checked', false);
         }
 
-        if (max_limit !== null) {
+        if (settings.max_limit !== null) {
             $('#payment-limit-max').removeAttr('disabled');
             $('#payment-limit-max-enable').prop('checked', true);
         } else {
@@ -209,6 +222,10 @@
         }
 
         $('#payment-limit-gateway-type').val(gateway_type_id);
+		$('#fee_amount').val(settings.fee_amount);
+		$('#fee_percent').val(settings.fee_percent);
+		setTaxRate(1, settings.fee_tax_name1, settings.fee_tax_rate1);
+		setTaxRate(2, settings.fee_tax_name2, settings.fee_tax_rate2);
 
         $('#paymentLimitsModal').modal('show');
     }
@@ -274,13 +291,13 @@
 
 		var taxRate1 = $('#tax_rate1').val();
 		if (taxRate1) {
-			taxRate1 = NINJA.parseFloat(taxRates[taxRate1-1].rate);
+			taxRate1 = NINJA.parseFloat(taxRatesMap[taxRate1].rate);
 			total += subtotal * taxRate1 / 100;
 		}
 
 		var taxRate2 = NINJA.parseFloat($('#tax_rate2').val());
 		if (taxRate2) {
-			taxRate2 = NINJA.parseFloat(taxRates[taxRate2-1].rate);
+			taxRate2 = NINJA.parseFloat(taxRatesMap[taxRate2].rate);
 			total += subtotal * taxRate2 / 100;
 		}
 
@@ -293,7 +310,7 @@
 	function onTaxRateChange(instance) {
 		var taxRate = $('#tax_rate' + instance).val();
 		if (taxRate) {
-			taxRate = taxRates[taxRate-1];
+			taxRate = taxRatesMap[taxRate];
 		}
 
 		$('#fee_tax_name' + instance).val(taxRate ? taxRate.name : '');
@@ -302,10 +319,30 @@
 		updateFeeSample();
 	}
 
+	function setTaxRate(instance, name, rate) {
+		if (!name || !rate) {
+			return;
+		}
+		var found = false;
+		for (var i=0; i<taxRates.length; i++) {
+			var taxRate = taxRates[i];
+			if (taxRate.name == name && taxRate.rate == rate) {
+				$('#tax_rate' + instance).val(taxRate.public_id);
+				found = true;
+			}
+		}
+		if (!found) {
+			taxRatesMap[0] = {name:name, rate:rate, public_id:0};
+			$('#tax_rate' + instance).append(new Option(name + ' ' + rate + '%', 0)).val(0);
+		}
+
+		onTaxRateChange(instance);
+	}
+
 	@if (Utils::isNinja())
 		updateFeeSample();
 		$(function() {
-			javascript:showLimitsModal('Credit Card', 1, null, null);
+			javascript:showLimitsModal('Credit Card', 1);
 		});
 	@endif