diff --git a/modules/contactform/views/templates/widget/contactform.tpl b/modules/contactform/views/templates/widget/contactform.tpl
index 702a5809..7343c7c4 100644
--- a/modules/contactform/views/templates/widget/contactform.tpl
+++ b/modules/contactform/views/templates/widget/contactform.tpl
@@ -122,7 +122,7 @@
           <input type="text" name="url" value=""/>
           <input type="hidden" name="token" value="{$token}" />
           <input class="btn btn-primary d-none d-md-inline-block" type="submit" name="submitMessage" value="{l s='Send' d='Shop.Theme.Actions'}">
-          <input class="btn btn-primary btn-block d-block d-md-none" type="submit" name="submitMessage" value="{l s='Send' d='Shop.Theme.Actions'}">
+          <input class="btn btn-primary d-block text-center w-100 d-block d-md-none" type="submit" name="submitMessage" value="{l s='Send' d='Shop.Theme.Actions'}">
         </footer>
       {/if}
     </div>
diff --git a/modules/productcomments/views/templates/hook/confirm-modal.tpl b/modules/productcomments/views/templates/hook/confirm-modal.tpl
index d2dd1c62..0522cb7c 100644
--- a/modules/productcomments/views/templates/hook/confirm-modal.tpl
+++ b/modules/productcomments/views/templates/hook/confirm-modal.tpl
@@ -57,10 +57,10 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary confirm-button btn-block" data-dismiss="modal" aria-label="{l s='Yes' d='Modules.Productcomments.Shop'}">
+        <button type="button" class="btn btn-primary confirm-button d-block text-center w-100" data-dismiss="modal" aria-label="{l s='Yes' d='Modules.Productcomments.Shop'}">
           {l s='Yes' d='Modules.Productcomments.Shop'}
         </button>
-        <button type="button" class="btn btn-text refuse-button btn-block" data-dismiss="modal" aria-label="{l s='No' d='Modules.Productcomments.Shop'}">
+        <button type="button" class="btn btn-text refuse-button d-block text-center w-100" data-dismiss="modal" aria-label="{l s='No' d='Modules.Productcomments.Shop'}">
           {l s='No' d='Modules.Productcomments.Shop'}
         </button>
       </div>
diff --git a/modules/productcomments/views/templates/hook/post-comment-modal.tpl b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
index 7811cc5a..a964343e 100644
--- a/modules/productcomments/views/templates/hook/post-comment-modal.tpl
+++ b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
@@ -32,7 +32,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title h5">{l s='Write your review' d='Modules.Productcomments.Shop'}</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -73,10 +73,10 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button type="submit" class="btn btn-primary btn-block">
+          <button type="submit" class="btn btn-primary d-block text-center w-100">
             {l s='Send' d='Modules.Productcomments.Shop'}
           </button>
-          <button type="button" class="btn btn-text btn-block" data-dismiss="modal" aria-label="{l s='Cancel' d='Modules.Productcomments.Shop'}">
+          <button type="button" class="btn btn-text d-block text-center w-100" data-dismiss="modal" aria-label="{l s='Cancel' d='Modules.Productcomments.Shop'}">
             {l s='Cancel' d='Modules.Productcomments.Shop'}
           </button>
         </div>
diff --git a/modules/ps_emailalerts/views/templates/hook/product-modal.tpl b/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
index a3db6008..425f564c 100644
--- a/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
+++ b/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
@@ -10,7 +10,7 @@
           <h5 class="modal-title">{l s='Notify me when available' d='Modules.Emailalerts.Shop'}</h5>
         {/block}
         {block name='modal_close'}
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         {/block}
@@ -46,7 +46,7 @@
     {/block}
     {block name='modal_footer'}
       <div class="modal-footer {block name='modal_footer_extra_class'}{/block}">
-        <button class="btn btn-primary btn-block js-mailalert-submit" type="submit">
+        <button class="btn btn-primary d-block text-center w-100 js-mailalert-submit" type="submit">
           {l s='Send' d='Shop.Theme.Actions'}
         </button>
       </div>
diff --git a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
index fcdba1f0..f9d7d37e 100644
--- a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
+++ b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
@@ -36,7 +36,7 @@
           {if $activeFilters|count}
             <div class="clear-all-wrapper card-body">
               <button data-search-url="{$clear_all_link}"
-                class="btn btn-sm btn-block btn-outline-secondary btn-sm js-search-filters-clear-all">
+                class="btn btn-sm d-block text-center w-100 btn-outline-secondary btn-sm js-search-filters-clear-all">
                 <i class="material-icons font-reset me-1 align-middle">&#xE14C;</i>
                 {l s='Clear all' d='Shop.Theme.Actions'}
               </button>
diff --git a/templates/_partials/modal-filters.tpl b/templates/_partials/modal-filters.tpl
index aa435c75..5809584c 100644
--- a/templates/_partials/modal-filters.tpl
+++ b/templates/_partials/modal-filters.tpl
@@ -10,7 +10,7 @@
 {/block}
 
 {block name='modal_footer'}
-  <button type="button" class="btn btn-block btn-primary" data-dismiss="modal" aria-label="Close">
+  <button type="button" class="btn d-block text-center w-100 btn-primary" data-dismiss="modal" aria-label="Close">
     {l s='Show results' d='Shop.Istheme'}
   </button>
 {/block}
diff --git a/templates/_partials/modal-search.tpl b/templates/_partials/modal-search.tpl
index 48bf7d8c..e261473f 100644
--- a/templates/_partials/modal-search.tpl
+++ b/templates/_partials/modal-search.tpl
@@ -4,7 +4,7 @@
 {block name='modal_extra_class'}modal-fullscreen search-modal{/block}
 {block name='modal_header'}{/block}
 {block name='modal_body'}
-  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+  <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
   <div id="_mobile_search_from">
diff --git a/templates/catalog/_partials/miniatures/_partials/product-form.tpl b/templates/catalog/_partials/miniatures/_partials/product-form.tpl
index 0eb86256..f9b78e22 100644
--- a/templates/catalog/_partials/miniatures/_partials/product-form.tpl
+++ b/templates/catalog/_partials/miniatures/_partials/product-form.tpl
@@ -1,6 +1,6 @@
 <div class="product-miniature__actions">
     {if $product.add_to_cart_url && ($product.quantity > 0 || $product.allow_oosp) && !$configuration.is_catalog}
-        <form class="product-miniature__form d-grid"
+        <form class="product-miniature__form"
               action="{$product.add_to_cart_url}"
               method="post">
           <input type="hidden" name="id_product" value="{$product.id}">
@@ -11,7 +11,7 @@
             class="form-control input-qty"
           >
           <button
-            class="btn btn-primary btn-block add-to-cart"
+            class="btn btn-primary d-block text-center w-100 add-to-cart"
             data-button-action="add-to-cart"
             type="submit"
             {if !$product.add_to_cart_url}
@@ -23,7 +23,7 @@
       </form>
     {else}
         <a href="{$product.canonical_url}"
-           class="btn btn-secondary btn-block"
+           class="btn btn-secondary d-block text-center w-100"
         > {l s='View' d='Shop.Theme.Actions'}
         </a>
     {/if}
diff --git a/templates/catalog/_partials/product-add-to-cart.tpl b/templates/catalog/_partials/product-add-to-cart.tpl
index e332cee0..4ad37ead 100644
--- a/templates/catalog/_partials/product-add-to-cart.tpl
+++ b/templates/catalog/_partials/product-add-to-cart.tpl
@@ -66,7 +66,7 @@
 
         <div class="add col mt-2 px-1 js-add-to-cart-btn-wrapper">
           <button
-            class="btn btn-primary add-to-cart btn-block"
+            class="btn btn-primary add-to-cart d-block text-center w-100"
             data-button-action="add-to-cart"
             type="submit"
             {if !$product.add_to_cart_url}
diff --git a/templates/catalog/_partials/products-top.tpl b/templates/catalog/_partials/products-top.tpl
index e3b29359..a2d0180f 100644
--- a/templates/catalog/_partials/products-top.tpl
+++ b/templates/catalog/_partials/products-top.tpl
@@ -40,7 +40,7 @@
       <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary d-sm-inline-block d-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
-      <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary btn-block d-sm-none">
+      <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary d-block text-center w-100 d-sm-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
     {/if}
diff --git a/templates/catalog/_partials/quickview.tpl b/templates/catalog/_partials/quickview.tpl
index 52b6b69d..3bfb692b 100644
--- a/templates/catalog/_partials/quickview.tpl
+++ b/templates/catalog/_partials/quickview.tpl
@@ -28,7 +28,7 @@
      <div class="modal-header">
       <h1 class="h3 modal-title">{$product.name}</h1>
 
-       <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+       <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
          <span aria-hidden="true">&times;</span>
        </button>
      </div>
diff --git a/templates/checkout/_partials/cart-detailed-product-line.tpl b/templates/checkout/_partials/cart-detailed-product-line.tpl
index 1f2bcea6..84552c6f 100644
--- a/templates/checkout/_partials/cart-detailed-product-line.tpl
+++ b/templates/checkout/_partials/cart-detailed-product-line.tpl
@@ -79,7 +79,7 @@
                   <div class="modal-content">
                     <div class="modal-header">
                       <h4 class="modal-title">{l s='Product customization' d='Shop.Theme.Catalog'}</h4>
-                      <button type="button" class="close" data-dismiss="modal"
+                      <button type="button" class="btn-close" data-dismiss="modal"
                         aria-label="{l s='Close' d='Shop.Theme.Global'}">
                         <span aria-hidden="true">&times;</span>
                       </button>
diff --git a/templates/checkout/_partials/customer-form.tpl b/templates/checkout/_partials/customer-form.tpl
index 0eff5f92..fdd84bb8 100644
--- a/templates/checkout/_partials/customer-form.tpl
+++ b/templates/checkout/_partials/customer-form.tpl
@@ -56,7 +56,7 @@
         {l s='Continue' d='Shop.Theme.Actions'}
     </button>
     <button
-      class="continue btn btn-primary btn-block d-block d-md-none"
+      class="continue btn btn-primary text-center w-100 d-block d-md-none"
       name="continue"
       data-link-action="register-new-customer"
       type="submit"
diff --git a/templates/checkout/_partials/footer.tpl b/templates/checkout/_partials/footer.tpl
index 3c363ffd..f9955114 100644
--- a/templates/checkout/_partials/footer.tpl
+++ b/templates/checkout/_partials/footer.tpl
@@ -27,7 +27,7 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+        <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
diff --git a/templates/checkout/_partials/login-form.tpl b/templates/checkout/_partials/login-form.tpl
index e5b7c005..f2eba394 100644
--- a/templates/checkout/_partials/login-form.tpl
+++ b/templates/checkout/_partials/login-form.tpl
@@ -36,7 +36,7 @@
       {l s='Continue' d='Shop.Theme.Actions'}
     </button>
     <button
-      class="continue btn btn-primary btn-block d-block d-md-none"
+      class="continue btn btn-primary text-center w-100 d-block d-md-none"
       name="continue"
       data-link-action="sign-in"
       type="submit"
diff --git a/templates/checkout/_partials/steps/addresses.tpl b/templates/checkout/_partials/steps/addresses.tpl
index 145f1ded..4bd26ff4 100644
--- a/templates/checkout/_partials/steps/addresses.tpl
+++ b/templates/checkout/_partials/steps/addresses.tpl
@@ -127,7 +127,7 @@
           <button type="submit" class="btn btn-primary continue d-none d-md-inline-block" name="confirm-addresses" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
-          <button type="submit" class="btn btn-primary continue btn-block d-block d-md-none" name="confirm-addresses" value="1">
+          <button type="submit" class="btn btn-primary continue text-center w-100 d-block d-md-none" name="confirm-addresses" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
           <input type="hidden" id="not-valid-addresses" class="js-not-valid-addresses" value="{$not_valid_addresses}">
diff --git a/templates/checkout/_partials/steps/payment.tpl b/templates/checkout/_partials/steps/payment.tpl
index 50861f05..56ef821b 100644
--- a/templates/checkout/_partials/steps/payment.tpl
+++ b/templates/checkout/_partials/steps/payment.tpl
@@ -112,7 +112,7 @@
         <button type="submit" class="btn btn-primary btn-lg d-none d-md-inline-block {if !$selected_payment_option} disabled {/if}">
           {l s='Place order' d='Shop.Theme.Checkout'}
         </button>
-        <button type="submit" class="btn btn-primary btn-lg btn-block d-block d-md-none {if !$selected_payment_option} disabled {/if}">
+        <button type="submit" class="btn btn-primary btn-lg text-center w-100 d-block d-md-none {if !$selected_payment_option} disabled {/if}">
           {l s='Place order' d='Shop.Theme.Checkout'}
         </button>
       </div>
diff --git a/templates/checkout/_partials/steps/personal-information.tpl b/templates/checkout/_partials/steps/personal-information.tpl
index e147ea21..3be569d3 100644
--- a/templates/checkout/_partials/steps/personal-information.tpl
+++ b/templates/checkout/_partials/steps/personal-information.tpl
@@ -43,7 +43,7 @@
           {l s='Continue' d='Shop.Theme.Actions'}
         </button>
         <button
-          class="continue btn btn-primary btn-block d-block d-md-none"
+          class="continue btn btn-primary text-center w-100 d-block d-md-none"
           name="controller"
           type="submit"
           value="order"
diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl
index 31038308..14dd0640 100644
--- a/templates/checkout/_partials/steps/shipping.tpl
+++ b/templates/checkout/_partials/steps/shipping.tpl
@@ -116,7 +116,7 @@
           <button type="submit" class="continue btn btn-primary d-none d-md-inline-block" name="confirmDeliveryOption" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
-          <button type="submit" class="continue btn btn-primary btn-block d-block d-md-none" name="confirmDeliveryOption" value="1">
+          <button type="submit" class="continue btn btn-primary text-center w-100 d-block d-md-none" name="confirmDeliveryOption" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
         </div>
diff --git a/templates/components/modal.tpl b/templates/components/modal.tpl
index 4c986871..dad671ba 100644
--- a/templates/components/modal.tpl
+++ b/templates/components/modal.tpl
@@ -13,7 +13,7 @@
                 <h5 class="modal-title">{$smarty.block.child}</h5>
               {/block}
               {block name='modal_close'}
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
                   <span aria-hidden="true">&times;</span>
                 </button>
               {/block}
diff --git a/templates/customer/_partials/account-transformation-form.tpl b/templates/customer/_partials/account-transformation-form.tpl
index 87342b71..6638a159 100644
--- a/templates/customer/_partials/account-transformation-form.tpl
+++ b/templates/customer/_partials/account-transformation-form.tpl
@@ -29,7 +29,7 @@
             <button class="btn btn-primary d-none d-md-inline-block" type="submit">
               {l s='Create account' d='Shop.Theme.Actions'}
             </button>
-            <button class="btn btn-primary btn-block d-block d-md-none" type="submit">
+            <button class="btn btn-primary text-center w-100 d-block d-md-none" type="submit">
               {l s='Create account' d='Shop.Theme.Actions'}
             </button>
           </div>
diff --git a/templates/customer/_partials/address-form.tpl b/templates/customer/_partials/address-form.tpl
index 3a0545b0..53d2358e 100644
--- a/templates/customer/_partials/address-form.tpl
+++ b/templates/customer/_partials/address-form.tpl
@@ -54,7 +54,7 @@
           <button class="btn btn-primary form-control-submit d-none d-md-inline-block" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
-          <button class="btn btn-primary form-control-submit btn-block d-block d-md-none" type="submit">
+          <button class="btn btn-primary form-control-submit text-center w-100 d-block d-md-none" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
         {/block}
diff --git a/templates/customer/_partials/customer-form.tpl b/templates/customer/_partials/customer-form.tpl
index 91afefab..a3f4f6d8 100644
--- a/templates/customer/_partials/customer-form.tpl
+++ b/templates/customer/_partials/customer-form.tpl
@@ -54,7 +54,7 @@
           <button class="btn btn-primary form-control-submit d-none d-md-inline-block" data-link-action="save-customer" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
-          <button class="btn btn-primary form-control-submit btn-block d-block d-md-none" data-link-action="save-customer" type="submit">
+          <button class="btn btn-primary form-control-submit text-center w-100 d-block d-md-none" data-link-action="save-customer" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
         {/block}
diff --git a/templates/customer/_partials/login-form.tpl b/templates/customer/_partials/login-form.tpl
index 74787a68..63bb28b9 100644
--- a/templates/customer/_partials/login-form.tpl
+++ b/templates/customer/_partials/login-form.tpl
@@ -52,7 +52,7 @@
           <button id="submit-login" class="btn btn-primary d-none d-md-inline-block" data-link-action="sign-in" type="submit" class="form-control-submit">
             {l s='Sign in' d='Shop.Theme.Actions'}
           </button>
-          <button id="submit-login" class="btn btn-primary btn-block d-block d-md-none" data-link-action="sign-in" type="submit" class="form-control-submit">
+          <button id="submit-login" class="btn btn-primary text-center w-100 d-block d-md-none" data-link-action="sign-in" type="submit" class="form-control-submit">
             {l s='Sign in' d='Shop.Theme.Actions'}
           </button>
         {/block}
diff --git a/templates/customer/_partials/order-detail-return.tpl b/templates/customer/_partials/order-detail-return.tpl
index 755640c9..8993e548 100644
--- a/templates/customer/_partials/order-detail-return.tpl
+++ b/templates/customer/_partials/order-detail-return.tpl
@@ -82,7 +82,7 @@
       <button class="btn btn-primary d-none d-md-inline-block" data-toggle="modal" data-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
-      <button class="btn btn-primary btn-block d-block d-md-none" data-toggle="modal" data-target="#order-return-modal">
+      <button class="btn btn-primary text-center w-100 d-block d-md-none" data-toggle="modal" data-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
     </div>
diff --git a/templates/customer/_partials/order-details-return-modal.tpl b/templates/customer/_partials/order-details-return-modal.tpl
index e5405b8d..8ecd68e8 100644
--- a/templates/customer/_partials/order-details-return-modal.tpl
+++ b/templates/customer/_partials/order-details-return-modal.tpl
@@ -13,7 +13,7 @@
           <h5 class="modal-title">{l s='Merchandise return' d='Shop.Theme.Customeraccount'}</h5>
         {/block}
         {block name='modal_close'}
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         {/block}
@@ -47,7 +47,7 @@
         <button class="form-control-submit btn btn-primary d-none d-md-inline-block" type="submit" name="submitReturnMerchandise">
           {l s='Request a return' d='Shop.Theme.Customeraccount'}
         </button>
-        <button class="form-control-submit btn btn-primary btn-block d-block d-md-none" type="submit" name="submitReturnMerchandise">
+        <button class="form-control-submit btn btn-primary text-center w-100 d-block d-md-none" type="submit" name="submitReturnMerchandise">
           {l s='Request a return' d='Shop.Theme.Customeraccount'}
         </button>
       </div>
diff --git a/templates/customer/_partials/order-details-return-table.tpl b/templates/customer/_partials/order-details-return-table.tpl
index 695ddebc..80fc83e6 100644
--- a/templates/customer/_partials/order-details-return-table.tpl
+++ b/templates/customer/_partials/order-details-return-table.tpl
@@ -114,7 +114,7 @@
                 <div class="modal-dialog" role="document">
                   <div class="modal-content">
                     <div class="modal-header">
-                      <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+                      <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
                         <span aria-hidden="true">&times;</span>
                       </button>
                       <h4 class="modal-title">{l s='Product customization' d='Shop.Theme.Catalog'}</h4>
diff --git a/templates/customer/_partials/order-messages.tpl b/templates/customer/_partials/order-messages.tpl
index 261cd3a8..416f5cb9 100644
--- a/templates/customer/_partials/order-messages.tpl
+++ b/templates/customer/_partials/order-messages.tpl
@@ -73,7 +73,7 @@
 
         <footer class="form-footer text-center mt-3">
           <input type="hidden" name="id_order" value="{$order.details.id}">
-          <button type="submit" name="submitMessage" class="btn btn-primary d-block btn-block d-md-none form-control-submit">
+          <button type="submit" name="submitMessage" class="btn btn-primary d-block text-center w-100 d-md-none form-control-submit">
             {l s='Send' d='Shop.Theme.Actions'}
           </button>
           <button type="submit" name="submitMessage" class="btn btn-primary form-control-submit d-none d-md-inline-block">
diff --git a/templates/customer/authentication.tpl b/templates/customer/authentication.tpl
index a4aa5d60..275a61fc 100644
--- a/templates/customer/authentication.tpl
+++ b/templates/customer/authentication.tpl
@@ -61,7 +61,7 @@
             <a href="{$urls.pages.register}" class="btn btn-primary d-none d-md-inline-block">
               {l s='I want to create an account' d='Shop.Istheme'}
             </a>
-            <a href="{$urls.pages.register}" class="btn btn-primary btn-block d-block d-md-none">
+            <a href="{$urls.pages.register}" class="btn btn-primary text-center w-100 d-block d-md-none">
               {l s='I want to create an account' d='Shop.Istheme'}
             </a>
           </div>
diff --git a/templates/customer/guest-login.tpl b/templates/customer/guest-login.tpl
index 6561c0ac..cd9fae33 100644
--- a/templates/customer/guest-login.tpl
+++ b/templates/customer/guest-login.tpl
@@ -75,7 +75,7 @@
       <button class="btn btn-primary d-none d-md-inline-block" type="submit">
         {l s='Send' d='Shop.Theme.Actions'}
       </button>
-      <button class="btn btn-primary btn-block d-block d-md-none" type="submit">
+      <button class="btn btn-primary text-center w-100 d-block d-md-none" type="submit">
         {l s='Send' d='Shop.Theme.Actions'}
       </button>
     </footer>
diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl
index 10b06cff..18d742ba 100644
--- a/templates/customer/history.tpl
+++ b/templates/customer/history.tpl
@@ -105,13 +105,13 @@
           <div class="card-footer">
             <div class="row mt-n2">
               <div class="col-sm-6 mt-2">
-                <a class="view-order-details-link btn btn-primary btn-block btn-sm" href="{$order.details.details_url}" data-link-action="view-order-details">
+                <a class="view-order-details-link btn btn-primary d-block  text-center w-100 btn-sm" href="{$order.details.details_url}" data-link-action="view-order-details">
                   {l s='Details' d='Shop.Theme.Customeraccount'}
                 </a>
               </div>
               {if $order.details.reorder_url}
                 <div class="col-sm-6 mt-2">
-                  <a class="reorder-link btn btn-light btn-block btn-sm" href="{$order.details.reorder_url}" data-link-action="view-order-details">
+                  <a class="reorder-link btn btn-light d-block  text-center w-100 btn-sm" href="{$order.details.reorder_url}" data-link-action="view-order-details">
                     {l s='Reorder' d='Shop.Theme.Actions'}
                   </a>
                 </div>
diff --git a/templates/customer/order-follow.tpl b/templates/customer/order-follow.tpl
index d04a6749..dc876f14 100644
--- a/templates/customer/order-follow.tpl
+++ b/templates/customer/order-follow.tpl
@@ -98,13 +98,13 @@
           <div class="card-footer">
             <div class="row mt-n2">
               <div class="col-sm-6 mt-2">
-                <a class="btn btn-primary btn-block btn-sm" href="{$return.return_url}">
+                <a class="btn btn-primary d-block  text-center w-100 btn-sm" href="{$return.return_url}">
                   {l s='Details' d='Shop.Theme.Customeraccount'}
                 </a>
               </div>
               {if $return.print_url}
                 <div class="col-sm-6 mt-2">
-                  <a class="btn btn-light btn-block btn-sm" href="{$return.print_url}">
+                  <a class="btn btn-light d-block  text-center w-100 btn-sm" href="{$return.print_url}">
                   {l s='Print out' d='Shop.Theme.Actions'}
                   </a>
                 </div>
diff --git a/templates/customer/order-return.tpl b/templates/customer/order-return.tpl
index 70bc9874..2838eab9 100644
--- a/templates/customer/order-return.tpl
+++ b/templates/customer/order-return.tpl
@@ -63,7 +63,7 @@
                     <div class="modal-dialog" role="document">
                       <div class="modal-content">
                         <div class="modal-header">
-                          <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+                          <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
                             <span aria-hidden="true">&times;</span>
                           </button>
                           <h4 class="modal-title">{l s='Product customization' d='Shop.Theme.Catalog'}</h4>
diff --git a/templates/customer/order-slip.tpl b/templates/customer/order-slip.tpl
index 03c495c5..902c7ce8 100644
--- a/templates/customer/order-slip.tpl
+++ b/templates/customer/order-slip.tpl
@@ -78,7 +78,7 @@
             </ul>
           </div>
           <div class="card-footer">
-            <a href="{$slip.url}" class="btn btn-primary btn-sm btn-block">
+            <a href="{$slip.url}" class="btn btn-primary btn-sm d-block  text-center w-100">
               <span class="material-icons btn-icon ms-1">file_download</span>
               {l s='View credit slip' d='Shop.Theme.Customeraccount'}
             </a>
diff --git a/templates/customer/password-email.tpl b/templates/customer/password-email.tpl
index 3c779836..b80241d2 100644
--- a/templates/customer/password-email.tpl
+++ b/templates/customer/password-email.tpl
@@ -53,7 +53,7 @@
           <button class="form-control-submit btn btn-primary d-none d-md-inline-block" name="submit" type="submit">
             {l s='Send reset link' d='Shop.Theme.Actions'}
           </button>
-          <button class="form-control-submit btn btn-primary btn-block d-block d-md-none" name="submit" type="submit">
+          <button class="form-control-submit btn btn-primary text-center w-100 d-block d-md-none" name="submit" type="submit">
             {l s='Send reset link' d='Shop.Theme.Actions'}
           </button>
         </div>
diff --git a/templates/customer/password-new.tpl b/templates/customer/password-new.tpl
index 2c326f7a..47f053e4 100644
--- a/templates/customer/password-new.tpl
+++ b/templates/customer/password-new.tpl
@@ -64,7 +64,7 @@
         <button class="btn btn-primary d-none d-md-inline-block" type="submit" name="submit">
           {l s='Change Password' d='Shop.Theme.Actions'}
         </button>
-        <button class="btn btn-primary btn-block d-block d-md-none" type="submit" name="submit">
+        <button class="btn btn-primary text-center w-100 d-block d-md-none" type="submit" name="submit">
           {l s='Change Password' d='Shop.Theme.Actions'}
         </button>
       </div>