diff --git a/Block/Totals/Fee.php b/Block/Totals/Fee.php
index 06c612d..0c2e5d7 100644
--- a/Block/Totals/Fee.php
+++ b/Block/Totals/Fee.php
@@ -39,39 +39,7 @@ public function getTitle(): string
                 ->getPayment();
             return $this->feeHelper->getBuckarooPaymentFeeLabel($payment->getMethod());
         } catch (\Throwable $th) {
-            return __('Fee');
+            return __('Payment Fee');
         }
     }
-
-    /**
-     * Get total from array of data
-     *
-     * @return float
-     */
-    public function getTotal(): float
-    {
-        $totalData = $this->getSegment();
-        if (false === is_array($totalData)) {
-            throw new \UnexpectedValueException('Expecting an array but getting '.gettype($totalData));
-        }
-
-        $extensionAttributes = $totalData['extension_attributes'];
-
-        if (
-            is_array($extensionAttributes) &&
-            isset($extensionAttributes['buckaroo_fee']) &&
-            is_scalar($extensionAttributes['buckaroo_fee'])
-        ) {
-            return floatval($extensionAttributes['buckaroo_fee']);
-        }
-
-        if ($extensionAttributes instanceof \Magento\Quote\Api\Data\TotalSegmentExtension) {
-            /** @var \Magento\Quote\Api\Data\TotalSegmentExtension $extensionAttributes */
-            if ($extensionAttributes->getBuckarooFee() !== null) {
-                return $extensionAttributes->getBuckarooFee();
-            }
-        }
-
-        return 0;
-    }
 }
diff --git a/view/frontend/layout/hyva_checkout_components.xml b/view/frontend/layout/hyva_checkout_components.xml
index 69f5457..3292516 100644
--- a/view/frontend/layout/hyva_checkout_components.xml
+++ b/view/frontend/layout/hyva_checkout_components.xml
@@ -202,9 +202,9 @@
             <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"
+            <block name="price-summary.total-segment.buckaroo_fee_hyva"
                 class="Buckaroo\HyvaCheckout\Block\Totals\Fee"
-                as="buckaroo_fee"
+                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 +212,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..b00a1fa 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) {
+$segment = $block->getSegment();
+if ($segment['value'] != 0) {
 ?>
     <div class="flex gap-4 justify-between md:gap-0">
-        <span class="label font-bold">
+        <span class="label">
             <?= $block->escapeHtml($block->getTitle()) ?>
         </span>
-        <span class="value"><?= /* @noEscape */ $formatterViewModel->currency($total ?? 0) ?></span>
+        <span class="value">
+            <?= /* @noEscape */ $formatterViewModel->currency($segment['value'] ?? 0) ?>
+        </span>
     </div>
 <?php
 }