diff --git a/src/templates/bootstrap5/address/form.ejs b/src/templates/bootstrap5/address/form.ejs
index 6723d2f1..3f09ec66 100644
--- a/src/templates/bootstrap5/address/form.ejs
+++ b/src/templates/bootstrap5/address/form.ejs
@@ -11,7 +11,7 @@
     >
     {% if (!ctx.component.disableClearIcon) { %}
       <i
-        class="address-autocomplete-remove-value-icon fa fa-times"
+        class="address-autocomplete-remove-value-icon fa fa-times bi bi-x"
         tabindex="{{ ctx.inputAttributes.tabindex }}"
         ref="{{ ctx.ref.removeValueIcon }}"
       ></i>
diff --git a/src/templates/bootstrap5/builderEditForm/form.ejs b/src/templates/bootstrap5/builderEditForm/form.ejs
index e9151133..3fd972d4 100644
--- a/src/templates/bootstrap5/builderEditForm/form.ejs
+++ b/src/templates/bootstrap5/builderEditForm/form.ejs
@@ -49,7 +49,7 @@
       <button class="btn btn-success" style="margin-right: 10px;" ref="saveButton">{{ctx.t('Save')}}</button>
       <button class="btn btn-secondary" style="margin-right: 10px;" ref="cancelButton">{{ctx.t('Cancel')}}</button>
       <button class="btn btn-danger" ref="removeButton">{{ctx.t('Remove')}}</button>
-      <button class="btn btn-primary float-right" ref="previewButton">{{ctx.t('Hide preview')}}</button>
+      <button class="btn btn-primary float-end" ref="previewButton">{{ctx.t('Hide preview')}}</button>
     </div>
   </div>
   {% } %}