diff --git a/etc/config.xml b/etc/config.xml
index 189cccd36..4a10236a0 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -41,7 +41,7 @@
0
Buckaroo\Magento2\Model\Method\Ideal
pending
-
Buckaroo iDEAL
+ iDEAL
0
10
1
@@ -57,7 +57,7 @@
0
Buckaroo\Magento2\Model\Method\PayByBank
pending
- Buckaroo PayByBank
+ PayByBank
0
350
1
@@ -71,7 +71,7 @@
0
Buckaroo\Magento2\Model\Method\IdealProcessing
pending
- Buckaroo iDEAL Processing
+ iDEAL Processing
0
10
1
@@ -86,7 +86,7 @@
0
Buckaroo\Magento2\Model\Method\SepaDirectDebit
pending
- Buckaroo SEPA Direct Debit
+ SEPA Direct Debit
0
110
4
@@ -102,7 +102,7 @@
0
Buckaroo\Magento2\Model\Method\Paypal
pending
- Buckaroo PayPal
+ PayPal
0
90
1
@@ -121,7 +121,7 @@
0
Buckaroo\Magento2\Model\Method\Payconiq
pending
- Buckaroo Payconiq
+ Payconiq
0
90
1
@@ -135,7 +135,7 @@
0
Buckaroo\Magento2\Model\Method\Creditcard
pending
- Buckaroo Creditcard and Debit Cards
+ Creditcard and Debit Cards
0
30
1
@@ -156,7 +156,7 @@
0
Buckaroo\Magento2\Model\Method\Creditcards
pending
- Buckaroo Creditcard and Debit Cards
+ Creditcard and Debit Cards
35
1
Fee
@@ -170,7 +170,7 @@
0
Buckaroo\Magento2\Model\Method\Transfer
pending
- Buckaroo Transfer
+ Transfer
0
100
1
@@ -189,7 +189,7 @@
0
Buckaroo\Magento2\Model\Method\Giropay
pending
- Buckaroo Giropay
+ Giropay
0
160
1
@@ -203,7 +203,7 @@
0
Buckaroo\Magento2\Model\Method\Mrcash
pending
- Buckaroo Bancontact/Mister Cash
+ Bancontact/Mister Cash
0
140
1
@@ -220,7 +220,7 @@
0
Buckaroo\Magento2\Model\Method\Sofortbanking
pending
- Buckaroo Sofort
+ Sofort
0
150
1
@@ -234,7 +234,7 @@
0
Buckaroo\Magento2\Model\Method\Belfius
pending
- Buckaroo Belfius
+ Belfius
0
150
1
@@ -248,7 +248,7 @@
0
Buckaroo\Magento2\Model\Method\Afterpay
pending
- Buckaroo Riverty
+ Riverty
0
150
1
@@ -264,7 +264,7 @@
0
Buckaroo\Magento2\Model\Method\Afterpay2
pending
- Buckaroo Riverty 2
+ Riverty 2
0
160
1
@@ -280,7 +280,7 @@
0
Buckaroo\Magento2\Model\Method\PayPerEmail
pending
- Buckaroo PayPerEmail
+ PayPerEmail
0
170
1
@@ -300,7 +300,7 @@
0
Buckaroo\Magento2\Model\Method\Eps
pending
- Buckaroo EPS
+ EPS
0
180
1
@@ -314,7 +314,7 @@
0
Buckaroo\Magento2\Model\Method\Giftcards
pending
- Buckaroo Giftcards
+ Giftcards
190
1
Fee
@@ -327,7 +327,7 @@
0
Buckaroo\Magento2\Model\Method\Kbc
pending
- Buckaroo KBC
+ KBC
0
210
1
@@ -341,7 +341,7 @@
0
Buckaroo\Magento2\Model\Method\Knaken
pending
- Buckaroo Knaken Settle
+ Knaken Settle
0
300
1
@@ -355,7 +355,7 @@
0
Buckaroo\Magento2\Model\Method\Multibanco
pending
- Buckaroo Multibanco
+ Multibanco
0
211
1
@@ -369,7 +369,7 @@
0
Buckaroo\Magento2\Model\Method\MBWay
pending
- Buckaroo MBWay
+ MBWay
0
212
1
@@ -383,7 +383,7 @@
0
Buckaroo\Magento2\Model\Method\PayLink
pending
- Buckaroo PayLink
+ PayLink
0
215
1
@@ -397,7 +397,7 @@
0
Buckaroo\Magento2\Model\Method\Klarna\PayLater
pending
- Buckaroo Klarna: Pay later
+ Klarna: Pay later
220
1
Fee
@@ -411,7 +411,7 @@
0
Buckaroo\Magento2\Model\Method\Klarnakp
pending
- Buckaroo Klarna: Pay later
+ Klarna: Pay later
220
1
Fee
@@ -425,7 +425,7 @@
0
Buckaroo\Magento2\Model\Method\Klarna\Klarnain
pending
- Buckaroo Klarna: Slice it
+ Klarna: Slice it
220
1
Fee
@@ -439,7 +439,7 @@
0
Buckaroo\Magento2\Model\Method\Emandate
pending
- Buckaroo Digitale Incassomachtiging
+ Digitale Incassomachtiging
1
nl
0
@@ -455,7 +455,7 @@
0
Buckaroo\Magento2\Model\Method\Afterpay20
pending
- Buckaroo Riverty
+ Riverty
0
240
1
@@ -488,7 +488,7 @@
0
Buckaroo\Magento2\Model\Method\Applepay
pending
- Buckaroo Apple Pay
+ Apple Pay
0
240
1
@@ -515,7 +515,7 @@
0
Buckaroo\Magento2\Model\Method\Alipay
pending
- Buckaroo Alipay
+ Alipay
0
270
1
@@ -529,7 +529,7 @@
0
Buckaroo\Magento2\Model\Method\Wechatpay
pending
- Buckaroo WeChatPay
+ WeChatPay
0
280
1
@@ -543,7 +543,7 @@
0
Buckaroo\Magento2\Model\Method\P24
pending
- Buckaroo Przelewy24
+ Przelewy24
0
290
1
@@ -557,7 +557,7 @@
0
Buckaroo\Magento2\Model\Method\Trustly
pending
- Buckaroo Trustly
+ Trustly
0
300
1
@@ -571,7 +571,7 @@
0
Buckaroo\Magento2\Model\Method\Pospayment
pending
- Buckaroo Point of Sale
+ Point of Sale
0
320
1
@@ -585,7 +585,7 @@
0
Buckaroo\Magento2\Model\Method\Voucher
pending
- Buckaroo Voucher
+ Voucher
0
340
1
diff --git a/view/base/web/images/svg/afterpay.svg b/view/base/web/images/svg/afterpay.svg
index 2b28dc73d..9a5f0d199 100644
--- a/view/base/web/images/svg/afterpay.svg
+++ b/view/base/web/images/svg/afterpay.svg
@@ -1,166 +1,195 @@