diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index a8006c2e09c0634db0cb3471bc8446be58881d38..58c6a3677081955c61a76cb12d2df262057e123d 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.2.3-beta02</Version>
+    <Version>7.2.3-beta03</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
index c333cdcf4117c34adef1dc2d6f3086b07ff38bc3..0e86c7929856ac054e8b57bc3d1f9bce17bd51ca 100644
--- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
+++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
@@ -39,30 +39,28 @@
                 <div class="modal-body">
                     @RenderBodyTemplate()
                 </div>
-            </CascadingValue>
-            @if (ShowFooter)
-            {
-                <div class="modal-footer">
-                    @if (ShowCloseButton)
-                    {
-                        <Button Color="Color.Secondary" Text="@CloseButtonText" Icon="fa-solid fa-fw fa-xmark" OnClickWithoutRender="OnClickClose" />
-                    }
-                    @if (ShowPrintButton && !ShowPrintButtonInHeader)
-                    {
-                        <PrintButton Color="Color.Primary" class="btn-print" Text="@PrintButtonText" />
-                    }
-                    @if (ShowSaveButton)
-                    {
-                        <Button Color="Color.Primary" Text="@SaveButtonText" Icon="fa-solid fa-fw fa-floppy-disk" OnClickWithoutRender="OnClickSave" />
-                    }
-                    @if (FooterTemplate != null)
-                    {
-                        <CascadingValue Value="OnClickClose" IsFixed>
+                @if (ShowFooter)
+                {
+                    <div class="modal-footer">
+                        @if (ShowCloseButton)
+                        {
+                            <DialogCloseButton Text="@CloseButtonText" Icon="@CloseButtonIcon" />
+                        }
+                        @if (ShowPrintButton && !ShowPrintButtonInHeader)
+                        {
+                            <PrintButton Color="Color.Primary" class="btn-print" Text="@PrintButtonText" />
+                        }
+                        @if (ShowSaveButton)
+                        {
+                            <Button Color="Color.Primary" Text="@SaveButtonText" Icon="fa-solid fa-fw fa-floppy-disk" OnClickWithoutRender="OnClickSave" />
+                        }
+                        @if (FooterTemplate != null)
+                        {
                             @FooterTemplate
-                        </CascadingValue>
-                    }
-                </div>
-            }
+                        }
+                    </div>
+                }
+            </CascadingValue>
         </CascadingValue>
     </div>
 </div>
diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
index 0d92565de74b6757ceb7ccdbbf3291ad56b8dc51..e3654a0f100998f317e6f6a6353432641b6fda3d 100644
--- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
@@ -183,6 +183,13 @@ public partial class ModalDialog : IHandlerException, IDisposable
     [NotNull]
     public string? CloseButtonText { get; set; }
 
+    /// <summary>
+    /// 获得/设置 关闭按钮显示图标 未设置时 使用 fa-solid fa-fw fa-xmark
+    /// </summary>
+    [Parameter]
+    [NotNull]
+    public string? CloseButtonIcon { get; set; }
+
     /// <summary>
     /// 获得/设置 保存按钮显示文字 资源文件设置为 保存
     /// </summary>
@@ -222,6 +229,8 @@ public partial class ModalDialog : IHandlerException, IDisposable
         CloseButtonText ??= Localizer[nameof(CloseButtonText)];
         SaveButtonText ??= Localizer[nameof(SaveButtonText)];
         PrintButtonText ??= Localizer[nameof(PrintButtonText)];
+
+        CloseButtonIcon ??= "fa-solid fa-fw fa-xmark";
     }
 
     /// <summary>