diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs
index ab35dbe804..ff0b9dd34f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Button/AbpButtonTagHelperServiceBase.cs
@@ -47,6 +47,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button
             var icon = new TagBuilder("i");
             icon.AddCssClass(GetIconClass(context, output));
             output.Content.AppendHtml(icon);
+            output.Content.Append(" ");
         }
 
         protected virtual string GetIconClass(TagHelperContext context, TagHelperOutput output)
@@ -80,4 +81,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
index 1bc6ab2f3a..31cccf2428 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
@@ -45,12 +45,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
                     sb.AppendLine(GetSaveButton());
                     break;
                 case AbpModalButtons.Save | AbpModalButtons.Cancel:
-                    sb.AppendLine(GetSaveButton());
                     sb.AppendLine(GetCancelButton());
+                    sb.AppendLine(GetSaveButton());
                     break;
                 case AbpModalButtons.Save | AbpModalButtons.Close:
-                    sb.AppendLine(GetSaveButton());
                     sb.AppendLine(GetCloseButton());
+                    sb.AppendLine(GetSaveButton());
                     break;
             }
 
@@ -72,6 +72,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             element.AddCssClass("btn-primary");
             element.Attributes.Add("data-busy-text", _localizer["SavingWithThreeDot"]);
             element.InnerHtml.AppendHtml(icon);
+            element.InnerHtml.AppendHtml(" ");
             element.InnerHtml.AppendHtml(span);
 
             return element.ToHtmlString();