diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/ToolbarManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/ToolbarManager.cs
index 51793c0cd7..5fefd1f243 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/ToolbarManager.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/ToolbarManager.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Views.Shared.Components.Theme.MainNavbar.Toolbar.Items.LanguageSwitch;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Views.Shared.Components.Theme.MainNavbar.Toolbar.Items.UserMenu;
 using Volo.Abp.DependencyInjection;
 
@@ -12,6 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
             {
                 Items =
                 {
+                    new ToolbarItem(typeof(LanguageSwitchViewComponent)),
                     new ToolbarItem(typeof(UserMenuViewComponent))
                 }
             };
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Default.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Default.cshtml
index 96b82b2f1c..bf5f7bcb66 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Default.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Default.cshtml
@@ -2,5 +2,5 @@
 @model Toolbar
 @foreach (var toolbarItem in Model.Items)
 {
-    <text>@(await Component.InvokeAsync(toolbarItem.ComponentType))</text>
+    <span>@(await Component.InvokeAsync(toolbarItem.ComponentType))</span>
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/Default.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/Default.cshtml
new file mode 100644
index 0000000000..e3715ed337
--- /dev/null
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/Default.cshtml
@@ -0,0 +1,14 @@
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Views.Shared.Components.Theme.MainNavbar.Toolbar.Items.LanguageSwitch
+@model LanguageSwitchViewComponentModel
+<div class="dropdown d-inline">
+    <a class="btn btn-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        @Model.CurrentLanguage.DisplayName
+    </a>
+
+    <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
+        @foreach (var language in Model.OtherLanguages)
+        {
+            <a class="dropdown-item" href="/Abp/Languages/Switch?culture=@(language.Name)&uiCulture=@(language.Name)">@language.DisplayName</a>
+        }
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageInfo.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageInfo.cs
new file mode 100644
index 0000000000..ca0d3b0f0d
--- /dev/null
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageInfo.cs
@@ -0,0 +1,11 @@
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Views.Shared.Components.Theme.MainNavbar.Toolbar.Items.LanguageSwitch
+{
+    public class LanguageInfo
+    {
+        public string Name { get; set; }
+
+        public string DisplayName { get; set; }
+
+        public string Icon { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageSwitchViewComponent.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageSwitchViewComponent.cs
new file mode 100644
index 0000000000..97e43de185
--- /dev/null
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageSwitchViewComponent.cs
@@ -0,0 +1,49 @@
+using System.Globalization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Views.Shared.Components.Theme.MainNavbar.Toolbar.Items.LanguageSwitch
+{
+    public class LanguageSwitchViewComponent : AbpViewComponent
+    {
+        private readonly RequestLocalizationOptions _options;
+
+        public LanguageSwitchViewComponent(IOptions<RequestLocalizationOptions> options)
+        {
+            _options = options.Value;
+        }
+
+        public IViewComponentResult Invoke()
+        {
+            //TODO: Better handle culture & uiculture separation!
+
+            var model = new LanguageSwitchViewComponentModel
+            {
+                CurrentLanguage = new LanguageInfo
+                {
+                    Name = CultureInfo.CurrentUICulture.Name,
+                    DisplayName = CultureInfo.CurrentUICulture.DisplayName,
+                    Icon = null //TODO!
+                }
+            };
+
+            foreach (var supportedUiCulture in _options.SupportedUICultures)
+            {
+                if (model.CurrentLanguage.Name == supportedUiCulture.Name)
+                {
+                    continue;
+                }
+
+                model.OtherLanguages.Add(new LanguageInfo
+                {
+                    Name = supportedUiCulture.Name,
+                    DisplayName = supportedUiCulture.DisplayName,
+                    Icon = null //TODO!
+                });
+            }
+
+            return View("~/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/Default.cshtml", model);
+        }
+    }
+}
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageSwitchViewComponentModel.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageSwitchViewComponentModel.cs
new file mode 100644
index 0000000000..939e567e7c
--- /dev/null
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/LanguageSwitch/LanguageSwitchViewComponentModel.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Views.Shared.Components.Theme.MainNavbar.Toolbar.Items.LanguageSwitch
+{
+    public class LanguageSwitchViewComponentModel
+    {
+        public LanguageInfo CurrentLanguage { get; set; }
+
+        public List<LanguageInfo> OtherLanguages { get; }
+
+        public LanguageSwitchViewComponentModel()
+        {
+            OtherLanguages = new List<LanguageInfo>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/UserMenu/Default.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/UserMenu/Default.cshtml
index 1e4b10ec7c..d42b45bd5b 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/UserMenu/Default.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/Theme/MainNavbar/Toolbar/Items/UserMenu/Default.cshtml
@@ -7,9 +7,17 @@
 @inject IHtmlLocalizer<AbpUiResource> L
 @if (CurrentUser.IsAuthenticated)
 {
-    <span style="color: #fff">@CurrentUser.UserName</span> <text>(<a href="/Account/Logout">@L["Logout"]</a>)</text>
+    <div class="dropdown d-inline">
+        <a class="btn btn-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            @CurrentUser.UserName
+        </a>
+
+        <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
+            <a class="dropdown-item" href="/Account/Logout">@L["Logout"]</a>
+        </div>
+    </div>
 }
 else
 {
-    <a href="/Account/Login">Login</a>
+    <a href="/Account/Login">@L["Login"]</a>
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj
index 2c358b1033..ad7365a86b 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj
@@ -19,6 +19,10 @@
     <EmbeddedResource Include="Views\**\*.cshtml" />
     <EmbeddedResource Include="wwwroot\**\*.*" />
   </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Remove="Views\Shared\Components\Theme\MainNavbar\Toolbar\Items\UserMenu\Default.cshtml" />
+  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/views/shared/_AppLayout.css b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/views/shared/_AppLayout.css
index 586cc9979a..dd91bf36b9 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/views/shared/_AppLayout.css
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/views/shared/_AppLayout.css
@@ -1,3 +1,8 @@
 body {
   padding-top: 5rem;
+}
+
+#main-navbar-tools a.dropdown-toggle {
+    text-decoration: none;
+    color: #fff;
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs
new file mode 100644
index 0000000000..79f9f17b2d
--- /dev/null
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs
@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Volo.Abp.AspNetCore.Mvc.Localization
+{
+    [Area("Abp")]
+    [Route("Abp/Languages/[action]")]
+    public class AbpLanguagesController : AbpController
+    {
+        [HttpGet]
+        public IActionResult Switch(string culture, string uiCulture = "") //TODO: Implement return URL
+        {
+            //TODO: Check allowed languages and so on...
+
+            Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, $"c={culture}|uic={uiCulture ?? culture}");
+            return Redirect("/");
+        }
+    }
+}