diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
index c5b8afa4e0..7515e228e1 100644
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
@@ -13,7 +13,7 @@
 }
 else
 {
-    <MudNavGroup Title="@MenuItem.DisplayName" Icon="@GetIcon(MenuItem.Icon)">
+    <MudNavGroup Title="@MenuItem.DisplayName" Icon="@MenuItem.Icon">
         @foreach (var item in MenuItem.Items)
         {
             @if (item.Items.Any())
@@ -22,11 +22,7 @@ else
             }
             else
             {
-                <MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
-                    @if (!string.IsNullOrEmpty(item.Icon))
-                    {
-                        <MudIcon Icon="@GetIcon(item.Icon)" Class="me-2" />
-                    }
+                <MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Icon="@item.Icon" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
                     @item.DisplayName
                 </MudNavLink>
             }
@@ -55,23 +51,6 @@ else
     {
         NavigationManager.LocationChanged -= OnLocationChanged;
     }
-
-    private string? GetIcon(string? icon)
-    {
-        if (string.IsNullOrEmpty(icon))
-        {
-            return null;
-        }
-
-        // Convert FontAwesome icons to Material icons if needed
-        if (icon.StartsWith("fa"))
-        {
-            // Map common FontAwesome icons to Material icons
-            return icon.Replace("fa-", "").Replace("-", "_");
-        }
-
-        return icon;
-    }
 }
 
 @implements IDisposable
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor
index 6f5c3deb54..ccb3d361c1 100644
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor
@@ -6,11 +6,7 @@
         {
             @if (menuItem.Items.IsNullOrEmpty())
             {
-                <MudNavLink Href="@menuItem.Url" Match="@(menuItem.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
-                    @if (!string.IsNullOrEmpty(menuItem.Icon))
-                    {
-                        <MudIcon Icon="@GetIcon(menuItem.Icon)" Class="me-2" />
-                    }
+                <MudNavLink Href="@menuItem.Url" Icon="@menuItem.Icon" Match="@(menuItem.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
                     @menuItem.DisplayName
                 </MudNavLink>
             }
@@ -19,24 +15,5 @@
                 <FirstLevelNavMenuItem MenuItem="menuItem" />
             }
         }
-    </MudNavMenu>   
-}
-
-@code {
-    private string? GetIcon(string? icon)
-    {
-        if (string.IsNullOrEmpty(icon))
-        {
-            return null;
-        }
-
-        // Convert FontAwesome icons to Material icons if needed
-        if (icon.StartsWith("fa"))
-        {
-            // Map common FontAwesome icons to Material icons
-            return icon.Replace("fa-", "").Replace("-", "_");
-        }
-
-        return icon;
-    }
+    </MudNavMenu>
 }
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
index 8961e74d61..85846a6d4a 100644
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
@@ -13,14 +13,10 @@
 }
 else
 {
-    <MudNavGroup Title="@MenuItem.DisplayName" Icon="@GetIcon(MenuItem.Icon)">
+    <MudNavGroup Title="@MenuItem.DisplayName" Icon="@MenuItem.Icon">
         @foreach (var item in MenuItem.Items)
         {
-            <MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
-                @if (!string.IsNullOrEmpty(item.Icon))
-                {
-                    <MudIcon Icon="@GetIcon(item.Icon)" Class="me-2" />
-                }
+            <MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Icon="@item.Icon" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
                 @item.DisplayName
             </MudNavLink>
         }
@@ -48,23 +44,6 @@ else
     {
         NavigationManager.LocationChanged -= OnLocationChanged;
     }
-
-    private string? GetIcon(string? icon)
-    {
-        if (string.IsNullOrEmpty(icon))
-        {
-            return null;
-        }
-
-        // Convert FontAwesome icons to Material icons if needed
-        if (icon.StartsWith("fa"))
-        {
-            // Map common FontAwesome icons to Material icons
-            return icon.Replace("fa-", "").Replace("-", "_");
-        }
-
-        return icon;
-    }
 }
 
 @implements IDisposable