diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
index 74c81ed72c..0de4e5de7a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
@@ -1,5 +1,6 @@
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Toolbars;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
@@ -15,6 +16,11 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
             {
                 options.AdditionalAssemblies.Add(typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule).Assembly);
             });
+
+            Configure<AbpToolbarOptions>(options =>
+            {
+                options.Contributors.Add(new BasicThemeToolbarContributor());
+            });
         }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeToolbarContributor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeToolbarContributor.cs
new file mode 100644
index 0000000000..8316a1480e
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeToolbarContributor.cs
@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Toolbars;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
+{
+    public class BasicThemeToolbarContributor : IToolbarContributor
+    {
+        public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
+        {
+            if (context.Toolbar.Name == StandardToolbars.Main)
+            {
+                context.Toolbar.Items.Add(new ToolbarItem(typeof(LanguageSwitch)));
+                context.Toolbar.Items.Add(new ToolbarItem(typeof(LoginDisplay)));
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
index 88a005d7bf..f55685e665 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
@@ -17,7 +17,7 @@
                         <DropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</DropdownItem>
                     }
                 }
-                <Divider />
+                <DropdownDivider />
                 <DropdownItem Clicked="BeginSignOut">Logout</DropdownItem>
             </DropdownMenu>
         </Dropdown>
@@ -32,7 +32,7 @@
     {
         Navigation.NavigateTo(uri);
     }
-    
+
     private async Task BeginSignOut()
     {
         await SignOutManager.SetSignOutState();
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
index af88212f0a..8e64b32022 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
@@ -13,14 +13,7 @@
             <ul class="navbar-nav mx-auto">
                 <NavMenu/>
             </ul>
-            <ul class="navbar-nav">
-                <li class="nav-item">
-                    <LanguageSwitch/>
-                </li>
-                <li class="nav-item">
-                    <LoginDisplay/>
-                </li>
-            </ul>
+            <NavToolbar/>
         </div>
     </div>
 </nav>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor
new file mode 100644
index 0000000000..5eea07ea8f
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor
@@ -0,0 +1,8 @@
+<ul class="navbar-nav">
+    @foreach (var render in ToolbarItemRenders)
+    {
+        <li class="nav-item">
+            @render
+        </li>
+    }
+</ul>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor.cs
new file mode 100644
index 0000000000..c2f08568e4
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Toolbars;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+{
+    public partial class NavToolbar
+    {
+        [Inject]
+        private IToolbarManager ToolbarManager { get; set; }
+
+        private RenderFragment ToolbarRender { get; set; }
+
+        private List<RenderFragment> ToolbarItemRenders { get; set; } = new List<RenderFragment>();
+
+        protected override async Task OnInitializedAsync()
+        {
+            var toolbar = await ToolbarManager.GetAsync(StandardToolbars.Main);
+
+            ToolbarItemRenders.Clear();
+
+            foreach (var item in toolbar.Items)
+            {
+                ToolbarItemRenders.Add(builder =>
+                {
+                    builder.OpenComponent(0, item.ComponentType);
+                    builder.CloseComponent();
+                });
+            }
+        }
+
+    }
+}