diff --git a/Block/Totals/Fee.php b/Block/Totals/Fee.php
deleted file mode 100644
index 574fbc2..0000000
--- a/Block/Totals/Fee.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Buckaroo\HyvaCheckout\Block\Totals;
-
-use Magento\Checkout\Model\Session as SessionCheckout;
-use Buckaroo\Magento2\Helper\PaymentFee;
-use Magento\Framework\View\Element\Template\Context;
-
-class Fee extends \Magento\Framework\View\Element\Template
-{
-    protected PaymentFee $feeHelper;
-
-    protected SessionCheckout $sessionCheckout;
-
-    public function __construct(
-        Context         $context,
-        array           $data,
-        PaymentFee      $feeHelper,
-        SessionCheckout $sessionCheckout
-    )
-    {
-        parent::__construct($context, $data);
-        $this->feeHelper = $feeHelper;
-        $this->sessionCheckout = $sessionCheckout;
-    }
-
-    /**
-     * Get title based on payment method config
-     *
-     * @return string
-     */
-    public function getTitle(): string
-    {
-        try {
-            $payment = $this->sessionCheckout
-                ->getQuote()
-                ->getPayment();
-            return $this->feeHelper->getBuckarooPaymentFeeLabel($payment->getMethod());
-        } catch (\Throwable $th) {
-            return __('Fee');
-        }
-        return __('Fee');
-    }
-
-    /**
-     * Get total from array of data
-     *
-     * @return float
-     */
-    public function getTotal(): float
-    {
-        $totalData = $this->getSegment();
-        $extensionAttributes = $totalData['extension_attributes'] ?? null;
-        if (
-            $extensionAttributes
-        ) {
-            return (floatval($extensionAttributes->getBuckarooFee()['buckaroo_fee'][0]));
-        }
-        return 0;
-    }
-}
diff --git a/view/frontend/layout/hyva_checkout_components.xml b/view/frontend/layout/hyva_checkout_components.xml
index 69f5457..5cbb3a2 100644
--- a/view/frontend/layout/hyva_checkout_components.xml
+++ b/view/frontend/layout/hyva_checkout_components.xml
@@ -202,9 +202,8 @@
             <block name="price-summary.total-segment.pretax_buckaroo_fee"
                 as="pretax_buckaroo_fee"
                 template="Buckaroo_HyvaCheckout::total-segments/empty.phtml"/>
-            <block name="price-summary.total-segment.buckaroo_fee"
-                class="Buckaroo\HyvaCheckout\Block\Totals\Fee"
-                as="buckaroo_fee"
+            <block name="price-summary.total-segment.buckaroo_fee_hyva"
+                as="buckaroo_fee_hyva"
                 template="Buckaroo_HyvaCheckout::total-segments/fee.phtml"/>
             <block name="price-summary.total-segment.buckaroo_already_paid"
                 class="Buckaroo\HyvaCheckout\Block\Totals\AlreadyPaid"
@@ -212,4 +211,4 @@
                 template="Buckaroo_HyvaCheckout::total-segments/already-paid.phtml"/>
         </referenceBlock>
     </body>
-</page>
\ No newline at end of file
+</page>
diff --git a/view/frontend/templates/total-segments/fee.phtml b/view/frontend/templates/total-segments/fee.phtml
index 77923b8..7cf866d 100644
--- a/view/frontend/templates/total-segments/fee.phtml
+++ b/view/frontend/templates/total-segments/fee.phtml
@@ -14,14 +14,16 @@ use Hyva\Checkout\ViewModel\Checkout\Formatter as FormatterViewModel;
 use Hyva\Theme\Model\ViewModelRegistry;
 
 $formatterViewModel = $viewModels->require(FormatterViewModel::class);
-$total = $block->getTotal();
-if ($total != 0) {
+$total = $block->getSegment();
+
+if ($total['value'] != 0) {
+
 ?>
     <div class="flex gap-4 justify-between md:gap-0">
         <span class="label font-bold">
-            <?= $block->escapeHtml($block->getTitle()) ?>
+            <?= $block->escapeHtml($total['title']) ?>
         </span>
-        <span class="value"><?= /* @noEscape */ $formatterViewModel->currency($total ?? 0) ?></span>
+        <span class="value"><?= /* @noEscape */ $formatterViewModel->currency($total['value'] ?? 0) ?></span>
     </div>
 <?php
 }