diff --git a/src/Resources/app/storefront/src/scss/base.scss b/src/Resources/app/storefront/src/scss/base.scss
index 34a02fc..fdc35dd 100644
--- a/src/Resources/app/storefront/src/scss/base.scss
+++ b/src/Resources/app/storefront/src/scss/base.scss
@@ -132,7 +132,6 @@ strong {
 
   .header-search {
     .header-search-input,
-    .input-group-append,
     .header-search-btn {
       height: 37px;
     }
diff --git a/src/Resources/views/storefront/component/product/card/action.html.twig b/src/Resources/views/storefront/component/product/card/action.html.twig
index 816c808..0348c2d 100644
--- a/src/Resources/views/storefront/component/product/card/action.html.twig
+++ b/src/Resources/views/storefront/component/product/card/action.html.twig
@@ -1,19 +1,11 @@
 {% sw_extends '@Storefront/storefront/component/product/card/action.html.twig' %}
 
 {% block component_product_box_action_detail %}
-    {% if feature('v6.5.0.0') %}
-        <div class="d-grid">
-            <a href="{{ seoUrl('frontend.detail.page', {'productId': id}) }}"
-               class="btn btn-buy"
-               title="{{ "listing.boxProductDetails"|trans|striptags }}">
-                {{ "listing.boxProductDetails"|trans|sw_sanitize }}
-            </a>
-        </div>
-    {% else %}
+    <div class="d-grid">
         <a href="{{ seoUrl('frontend.detail.page', {'productId': id}) }}"
-           class="btn btn-block btn-buy"
+           class="btn btn-buy"
            title="{{ "listing.boxProductDetails"|trans|striptags }}">
             {{ "listing.boxProductDetails"|trans|sw_sanitize }}
         </a>
-    {% endif %}
+    </div>
 {% endblock %}
diff --git a/src/Resources/views/storefront/layout/header/actions/account-widget.html.twig b/src/Resources/views/storefront/layout/header/actions/account-widget.html.twig
index 1070df0..43dbece 100644
--- a/src/Resources/views/storefront/layout/header/actions/account-widget.html.twig
+++ b/src/Resources/views/storefront/layout/header/actions/account-widget.html.twig
@@ -5,7 +5,7 @@
             type="button"
             id="accountWidget"
             data-offcanvas-account-menu="true"
-            {{ dataBsToggleAttr }}="dropdown"
+            data-bs-toggle="dropdown"
             aria-haspopup="true"
             aria-expanded="false"
             aria-label="{{ "account.myAccount"|trans|striptags }}"
diff --git a/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig b/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig
index 8b326f6..dc5e6b8 100644
--- a/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig
+++ b/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig
@@ -5,7 +5,7 @@
         {% sw_icon 'bag' %}
     </span>
     {% if page.cart.lineItems|length > 0 %}
-        <span class="badge {{ bgClass }}-primary header-cart-badge">{{ page.cart.lineItems|length }}</span>
+        <span class="badge bg-primary header-cart-badge">{{ page.cart.lineItems|length }}</span>
     {% endif %}
     <span class="header-cart-total">
         {{ page.cart.price.positionPrice|currency }}{{ "general.star"|trans|sw_sanitize }}
diff --git a/src/Resources/views/storefront/page/checkout/confirm/index.html.twig b/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
index 3d7b211..e4caf8a 100644
--- a/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
+++ b/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
@@ -5,7 +5,7 @@
 
 {% block page_checkout_confirm_tos_control_label %}
     <label for="tos"
-           class="checkout-confirm-tos-label {{ formCheckLabelClass }}">
+           class="checkout-confirm-tos-label form-check-label">
         {{ "checkout.confirmTerms"|trans({
             '%url%': path('frontend.cms.page',{ id: config('core.basicInformation.tosPage'), }),
             '%revUrl%': path('frontend.cms.page',{ id: config('core.basicInformation.revocationPage') })