diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index f09a6466d49..093964aa5e4 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -60,7 +60,7 @@ class PaymentAcquirer(models.Model):
     """
     _name = 'payment.acquirer'
     _description = 'Payment Acquirer'
-    _order = 'state desc, sequence, name'
+    _order = 'module_state, state, sequence, name'
 
     def _get_default_view_template_id(self):
         return self.env.ref('payment.default_acquirer_button', raise_if_not_found=False)
diff --git a/addons/payment/views/payment_templates.xml b/addons/payment/views/payment_templates.xml
index 180f573a0e9..e0e5a57df8e 100644
--- a/addons/payment/views/payment_templates.xml
+++ b/addons/payment/views/payment_templates.xml
@@ -65,7 +65,7 @@
                             </t>
                             <span class="payment_option_name">
                               <t t-esc="acq.display_as or acq.name"/>
-                              <div t-if="acq.state == 'test'" class="badge-pill badge-warning float-right">
+                              <div t-if="acq.state == 'test'" class="badge-pill badge-warning float-right" style="margin-left:5px">
                                 Test Mode
                               </div>
                             </span>