diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
index 6e6e3699787..7da292f7f83 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
@@ -26,7 +26,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
                  .Add(S["Configuration"], configuration => configuration
                      .Add(S["Settings"], settings => settings
                         .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), settings => settings
-                            .AddClass("audittrail").Id("audittrail")
+                            .AddClass("audittrail").Id("audittrailSettings")
                             .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = AuditTrailSettingsGroup.Id })
                             .Permission(AuditTrailPermissions.ManageAuditTrailSettings)
                             .LocalNav())));
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml
index 648fbe97f86..a40f9e8651c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml
@@ -1,17 +1,18 @@
 @inject IAuthorizationService AuthorizationService
 <div class="dropdown">
-    <form asp-route-area="OrchardCore.Users" asp-controller="Account" asp-action="LogOff" method="post" class="form-inline" class="no-multisubmit">
-        <a class="ml-3 dropdown-toggle" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" role="button" data-toggle-tooltip="tooltip" title="@User.Identity.Name">
+    <form asp-route-area="OrchardCore.Users" asp-controller="Account" asp-action="LogOff" method="post" class="form-inline no-multisubmit">
+        <button type="button" class="ml-3 dropdown-toggle" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle-tooltip="tooltip" title="@User.Identity.Name">
             <i class="fa fa-fw fa-user" aria-hidden="true"></i>
-        </a>
+            <span>@T[User.Identity.Name]</span>
+        </button>
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
             <h6 class="dropdown-header">@T["Signed in as"]<span class="ml-1 font-weight-bold">@User.Identity.Name</span></h6>
             <div class="dropdown-divider"></div>
             @if (await AuthorizationService.AuthorizeAsync(User, Permissions.ManageOwnUserInformation))
             {
-                <a class="dropdown-item" asp-area="OrchardCore.Users" asp-action="Edit" asp-controller="Admin" asp-route-returnUrl="@FullRequestPath"><span><i class="far fa-address-card" aria-hidden="true"></i></span>&nbsp;<span> @T["Profile"]</span></a>
+                <a class="dropdown-item" asp-area="OrchardCore.Users" asp-action="Edit" asp-controller="Admin" asp-route-returnurl="@FullRequestPath"><span><i class="far fa-address-card" aria-hidden="true"></i></span>&nbsp;<span> @T["Profile"]</span></a>
             }
-            <a class="dropdown-item" asp-area="OrchardCore.Users" asp-controller="Account" asp-action="ChangePassword" asp-route-returnUrl="@FullRequestPath"><span><i class="fas fa-key" aria-hidden="true"></i></span>&nbsp;<span> @T["Change password"]</span></a>
+            <a class="dropdown-item" asp-area="OrchardCore.Users" asp-controller="Account" asp-action="ChangePassword" asp-route-returnurl="@FullRequestPath"><span><i class="fas fa-key" aria-hidden="true"></i></span>&nbsp;<span> @T["Change password"]</span></a>
             <button type="submit" class="dropdown-item"><span><i class="fa fa-sign-out-alt" aria-hidden="true"></i></span>&nbsp;<span> @T["Log off"]</span></button>
         </div>
     </form>
diff --git a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
index 8812d39e3a6..1865fbe86df 100644
--- a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
+++ b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
@@ -43,18 +43,20 @@
                     @await RenderSectionAsync("NavbarTop", required: false)
                     @if (adminSettings.DisplayDarkMode)
                     {
-                        <a id="btn-darkmode" class="ml-3" data-toggle="tooltip" title="@(darkMode ? T["Light mode"] : T["Dark mode"])" role="button">
+                        <button type="button" id="btn-darkmode" class="ml-3" data-toggle="tooltip" title="@(darkMode ? T["Light mode"] : T["Dark mode"])">
                             @if (darkMode)
                             {
                                 <i class="fas fa-sun" aria-hidden="true"></i>
+                                <span>@T["Light mode"]</span>
                             }
                             else
                             {
                                 <i class="fas fa-moon" aria-hidden="true"></i>
+                                <span>@T["Dark mode"]</span>
                             }
-                        </a>
+                        </button>
                     }
-                    <a href="@Url.Content("~/")" class="ml-3" target="_blank" data-toggle="tooltip" title="@T["Visit Site"]" role="button">
+                    <a href="@Url.Content("~/")" class="ml-3" target="_blank" data-toggle="tooltip" aria-label="@T["Visit Site"]" title="@T["Visit Site"]">
                         <i class="fa fa-fw fa-external-link" aria-hidden="true"></i>
                     </a>
                     @await DisplayAsync(await New.UserMenu())
@@ -65,7 +67,9 @@
         <div id="ta-left-sidebar" class="d-flex flex-column justify-content-between align-items-stretch">
             @await RenderSectionAsync("Navigation", required: false)
             <div class="footer">
-                <button class="leftbar-compactor" type="button" title="@T["Collapse / expand menu"]"></button>
+                <button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
+                    <span>@T["Collapse / expand menu"]</span>
+                </button>
             </div>
         </div>
 
diff --git a/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css b/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css
index c2c900dd991..341098ba8f8 100644
--- a/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css
+++ b/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css
@@ -22138,6 +22138,15 @@ a[dir]:root[data-theme=default] .badge-dark:focus, a[data-theme=default][dir]:ro
   color: #495057;
   text-decoration: none;
 }
+:root[data-theme=default] .ta-navbar-top button {
+  border: 0;
+  background-color: transparent;
+  color: #495057;
+  padding: 0;
+}
+:root[data-theme=default] .ta-navbar-top button.ml-3 > span {
+  display: none;
+}
 [dir]:root[data-theme=default] .ta-badge {
   background-color: #e9ecef;
 }
@@ -23214,6 +23223,9 @@ a[dir]:root[data-theme=default] .badge-dark:focus, a[data-theme=default][dir]:ro
   transition-duration: 0.2s;
   transform: scale(2, 1);
 }
+[dir]:root[data-theme=default] button.leftbar-compactor > span {
+  display: none;
+}
 [dir=ltr]:root[data-theme=default] .leftbar-compactor {
   float: right;
 }
@@ -45605,6 +45617,15 @@ a[dir]:root[data-theme=darkmode] .badge-dark:focus, a[dir]:root[data-theme=darkm
   color: #dee2e6;
   text-decoration: none;
 }
+:root[data-theme=darkmode] .ta-navbar-top button {
+  border: 0;
+  background-color: transparent;
+  color: #dee2e6;
+  padding: 0;
+}
+:root[data-theme=darkmode] .ta-navbar-top button.ml-3 > span {
+  display: none;
+}
 [dir]:root[data-theme=darkmode] .ta-badge {
   background-color: #0c0d0e;
 }
@@ -46681,6 +46702,9 @@ a[dir]:root[data-theme=darkmode] .badge-dark:focus, a[dir]:root[data-theme=darkm
   transition-duration: 0.2s;
   transform: scale(2, 1);
 }
+[dir]:root[data-theme=darkmode] button.leftbar-compactor > span {
+  display: none;
+}
 [dir=ltr]:root[data-theme=darkmode] .leftbar-compactor {
   float: right;
 }