diff --git a/modules/ppcp-local-alternative-payment-methods/resources/js/apm-block.js b/modules/ppcp-local-alternative-payment-methods/resources/js/apm-block.js
index 6f280772b..0683e2538 100644
--- a/modules/ppcp-local-alternative-payment-methods/resources/js/apm-block.js
+++ b/modules/ppcp-local-alternative-payment-methods/resources/js/apm-block.js
@@ -1,9 +1,16 @@
 export function APM( { config, components } ) {
 	const { PaymentMethodIcons } = components;
 
-	return (
-		<div>
-			<PaymentMethodIcons icons={ [ config.icon ] } align="right" />
-		</div>
-	);
+    return (
+        <div>
+            <div
+                className="wc-block-components-payment-method-icons wc-block-components-payment-method-icons--align-right">
+                <img
+                    className={`wc-block-components-payment-method-icon wc-block-components-payment-method-icon--${config.id}`}
+                    src={config.icon}
+                    alt={config.title}
+                />
+            </div>
+        </div>
+    );
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/BancontactPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/BancontactPaymentMethod.php
index 94b6cba48..b1e909979 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/BancontactPaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/BancontactPaymentMethod.php
@@ -91,7 +91,7 @@ class BancontactPaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'bancontact',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/BlikPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/BlikPaymentMethod.php
index de68baa85..2300e4bad 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/BlikPaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/BlikPaymentMethod.php
@@ -91,7 +91,7 @@ class BlikPaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'blik',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/EPSPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/EPSPaymentMethod.php
index 4848acf03..8d537b64f 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/EPSPaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/EPSPaymentMethod.php
@@ -91,7 +91,7 @@ class EPSPaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'eps',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php
index 03a9c02f4..ac9ba3f31 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php
@@ -91,7 +91,7 @@ class IDealPaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'ideal',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/MultibancoPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/MultibancoPaymentMethod.php
index 556badc3f..d128fe0a8 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/MultibancoPaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/MultibancoPaymentMethod.php
@@ -91,7 +91,7 @@ class MultibancoPaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'multibanco',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php
index b3bb2d515..44de8b050 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php
@@ -91,7 +91,7 @@ class MyBankPaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'mybank',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/P24PaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/P24PaymentMethod.php
index 4cb89b393..8dc7a6541 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/P24PaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/P24PaymentMethod.php
@@ -91,7 +91,7 @@ class P24PaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'p24',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }
diff --git a/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php
index c7a501cf0..b16a507f1 100644
--- a/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php
+++ b/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php
@@ -91,7 +91,7 @@ class TrustlyPaymentMethod extends AbstractPaymentMethodType {
 			'id'          => $this->name,
 			'title'       => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'icon'        => 'trustly',
+			'icon'        => $this->gateway->icon,
 		);
 	}
 }