diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 070e3fdf..64403d74 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -48,7 +48,7 @@ else
 
     @if (_logs.Any())
     {
-        <Pager Items="@_logs">
+        <Pager TableItem="Log" Items="@_logs">
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
                 <th>@Localizer["Date"]</th>
@@ -141,6 +141,10 @@ else
     private async Task GetLogs()
     {
         _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? string.Empty : _level), ((_function == "-") ? string.Empty : _function), int.Parse(_rows));
+        await InvokeAsync(() =>
+        {
+            base.StateHasChanged();
+        });
     }
 
     private string GetClass(string function)
diff --git a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
index 840fbf4e..5e75738b 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
@@ -8,15 +8,15 @@
         {
             if (childPage.PageId == PageState.Page.PageId)
             {
-                <a class="dropdown-item active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
-                    @childPage.Name <span class="sr-only">(current)</span>
+                <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                        <span class="@childPage.Icon" aria-hidden="true" />
+                        @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             }
             else
             {
-                <a class="dropdown-item" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name
                 </a>
             }
@@ -34,7 +34,7 @@ else
                 {
                     <li class="nav-item active">
                         <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="sr-only">(current)</span>
                         </a>
                     </li>
@@ -43,7 +43,7 @@ else
                 {
                     <li class="nav-item">
                         <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
                     </li>
@@ -55,7 +55,7 @@ else
                 {
                     <li class="nav-item dropdown active">
                         <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="sr-only">(current)</span>
                         </a>
                         <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
@@ -65,7 +65,7 @@ else
                 {
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
                         <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
diff --git a/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor b/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
index a27f9a7a..2f314ca0 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
@@ -9,7 +9,7 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             </li>
@@ -18,7 +18,7 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name
                 </a>
             </li>
@@ -38,7 +38,7 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                        <FontIcon Value="@childPage.Icon" />
+                        <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name <span class="sr-only">(current)</span>
                     </a>
                 </li>
@@ -47,7 +47,7 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                        <FontIcon Value="@childPage.Icon" />
+                        <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name
                     </a>
                 </li>