diff --git a/src/Handlers/AfterPayOld.php b/src/Handlers/AfterPayOld.php
index 5eea20a1..dc674522 100644
--- a/src/Handlers/AfterPayOld.php
+++ b/src/Handlers/AfterPayOld.php
@@ -243,19 +243,54 @@ private function getBirthDate(RequestDataBag $dataBag)
      */
     private function getItemVatCategory(array $item): int
     {
-        if (!isset($item['taxId']) ||
-            !is_string($item['taxId'])
-        ) {
-            return 4;
+        $vatRate = null;
+        if (isset($item['vatRate'])) {
+            $vatRate = (float)$item['vatRate'];
         }
 
-        $taxId = $item['taxId'];
-        $taxAssociation = $this->settingsService->getSetting('afterpayOldtax');
+        if (isset($item['taxId']) && is_string($item['taxId'])) {
+            $taxId = $item['taxId'];
+            $taxAssociation = $this->settingsService->getSetting('afterpayOldtax');
 
-        if (is_array($taxAssociation) && isset($taxAssociation[$taxId])) {
-            return (int)$taxAssociation[$taxId];
+            if (is_array($taxAssociation) && isset($taxAssociation[$taxId])) {
+                $mappedCategory = (int)$taxAssociation[$taxId];
+
+                if ($mappedCategory > 0) {
+                    return $mappedCategory;
+                }
+            }
+        }
+
+        if ($vatRate !== null) {
+            return $this->mapVatRateToVatCategory($vatRate);
         }
 
         return 4;
     }
+
+    /**
+     * Map a VAT percentage to Riverty/AfterPay VAT category
+     *
+     * 1 = High rate
+     * 2 = Low rate
+     * 3 = Zero rate
+     * 4 = Null rate (unknown)
+     * 5 = Middle rate
+     */
+    private function mapVatRateToVatCategory(float $vatRate): int
+    {
+        if ($vatRate <= 0.0001) {
+            return 3;
+        }
+
+        if ($vatRate < 12.0) {
+            return 2;
+        }
+
+        if ($vatRate >= 20.0) {
+            return 1;
+        }
+
+        return 5;
+    }
 }
diff --git a/src/Resources/public/images/zakelijk-op-rekening-abn-amro.svg b/src/Resources/public/images/zakelijk-op-rekening-abn-amro.svg
new file mode 100644
index 00000000..caeaad6a
--- /dev/null
+++ b/src/Resources/public/images/zakelijk-op-rekening-abn-amro.svg
@@ -0,0 +1,12 @@
+<svg width="96" height="72" viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_97_162)">
+<path d="M91 0H5C2.23858 0 0 2.23858 0 5V67C0 69.7614 2.23858 72 5 72H91C93.7614 72 96 69.7614 96 67V5C96 2.23858 93.7614 0 91 0Z" fill="white"/>
+<path d="M65.9353 12H30V42.0323L47.9806 60V23.9094L65.9353 41.877V12Z" fill="#009286"/>
+<path d="M65.9357 42.0324L47.981 60V23.9094L65.9357 42.0324Z" fill="#F3C000"/>
+</g>
+<defs>
+<clipPath id="clip0_97_162">
+<rect width="96" height="72" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/Resources/views/storefront/buckaroo/payments/zakelijk-op-rekening-abn-amro.svg b/src/Resources/views/storefront/buckaroo/payments/zakelijk-op-rekening-abn-amro.svg
new file mode 100644
index 00000000..caeaad6a
--- /dev/null
+++ b/src/Resources/views/storefront/buckaroo/payments/zakelijk-op-rekening-abn-amro.svg
@@ -0,0 +1,12 @@
+<svg width="96" height="72" viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_97_162)">
+<path d="M91 0H5C2.23858 0 0 2.23858 0 5V67C0 69.7614 2.23858 72 5 72H91C93.7614 72 96 69.7614 96 67V5C96 2.23858 93.7614 0 91 0Z" fill="white"/>
+<path d="M65.9353 12H30V42.0323L47.9806 60V23.9094L65.9353 41.877V12Z" fill="#009286"/>
+<path d="M65.9357 42.0324L47.981 60V23.9094L65.9357 42.0324Z" fill="#F3C000"/>
+</g>
+<defs>
+<clipPath id="clip0_97_162">
+<rect width="96" height="72" fill="white"/>
+</clipPath>
+</defs>
+</svg>