diff --git a/Model/MethodMetaData.php b/Model/MethodMetaData.php
deleted file mode 100644
index 5583303..0000000
--- a/Model/MethodMetaData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Buckaroo\HyvaCheckout\Model;
-
-use Hyva\Checkout\Model\MethodMetaData as ModelMethodMetaData;
-use Hyva\Checkout\Model\ConfigData\HyvaThemes\SystemConfigPayment;
-use Hyva\Checkout\Model\MethodMetaData\IconRenderer;
-use Hyva\Checkout\Model\MethodMetaData\SubtitleRenderer;
-use Magento\Payment\Model\MethodInterface as PaymentMethodInterface;
-use Psr\Log\LoggerInterface;
-use Magento\Framework\View\Asset\Repository;
-
-class MethodMetaData extends ModelMethodMetaData
-{
-    protected Repository $assetRepository;
-
-    public function __construct(
-        IconRenderer $iconRenderer,
-        SubtitleRenderer $subtitleRenderer,
-        LoggerInterface $logger,
-        PaymentMethodInterface $method,
-        SystemConfigPayment $systemConfigPayment,
-        Repository $assetRepository,
-        array $data = []
-    ) {
-        parent::__construct($iconRenderer, $subtitleRenderer, $method, $systemConfigPayment, $data);
-        $this->assetRepository = $assetRepository;
-    }
-    public function renderIcon(): string
-    {
-        $icon = parent::getData(self::ICON);
-
-        if (!is_array($icon)) {
-            return '';
-        }
-        $logoLink = $this->assetRepository->getUrl($icon['svg']);
-        return '<img style="height:30px" src="' . $logoLink . '">';
-    }
-}
diff --git a/Plugin/IconRenderer.php b/Plugin/IconRenderer.php
new file mode 100644
index 0000000..04a328d
--- /dev/null
+++ b/Plugin/IconRenderer.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Buckaroo\HyvaCheckout\Plugin;
+
+use Hyva\Checkout\Model\MethodMetaData\IconRenderer as IconRendererHyva;
+use Magento\Framework\View\Asset\Repository;
+
+class IconRenderer
+{
+    protected Repository $assetRepository;
+
+    public function __construct(
+        Repository $assetRepository
+    ) {
+        $this->assetRepository = $assetRepository;
+    }
+
+    public function aroundRender(
+        IconRendererHyva $subject,
+        callable $proceed,
+        array $icon
+    ): string {
+        // Check if this is a Buckaroo method and handle it
+        if (isset($icon['svg']) && strpos($icon['svg'], 'Buckaroo_') !== false) {
+            $logoLink = $this->assetRepository->getUrl($icon['svg']);
+            return '<img style="height:30px" src="' . $logoLink . '">';
+        }
+
+        // Otherwise, proceed with the default behavior
+        return $proceed($icon);
+    }
+}
diff --git a/Plugin/MethodList.php b/Plugin/MethodList.php
index 89efd80..eb5f1e9 100644
--- a/Plugin/MethodList.php
+++ b/Plugin/MethodList.php
@@ -8,7 +8,7 @@
 use Magento\Payment\Model\MethodInterface as PaymentMethodInterface;
 use Buckaroo\Magento2\Model\ConfigProvider\Method\ConfigProviderInterface;
 use Hyva\Checkout\ViewModel\Checkout\Payment\MethodList as HyvaMethodList;
-use Buckaroo\HyvaCheckout\Model\MethodMetaDataFactory;
+use Hyva\Checkout\Model\MethodMetaDataFactory;
 
 class MethodList implements \Magento\Framework\View\Element\Block\ArgumentInterface
 {
diff --git a/etc/di.xml b/etc/di.xml
index cfb41fd..35ef475 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -4,4 +4,8 @@
      <type name="Hyva\Checkout\ViewModel\Checkout\Payment\MethodList">
         <plugin name="buckaroo-hyva-logo-subtext" type="Buckaroo\HyvaCheckout\Plugin\MethodList" />
     </type>
+
+    <type name="Hyva\Checkout\Model\MethodMetaData\IconRenderer">
+        <plugin name="buckaroo_hyva_checkout_icon_renderer" type="Buckaroo\HyvaCheckout\Plugin\IconRenderer" />
+    </type>
 </config>