diff --git a/src/Blogifier.Admin/Blogifier.Admin.csproj b/src/Blogifier.Admin/Blogifier.Admin.csproj
index 13d58480c..1b365811c 100644
--- a/src/Blogifier.Admin/Blogifier.Admin.csproj
+++ b/src/Blogifier.Admin/Blogifier.Admin.csproj
@@ -82,4 +82,5 @@
       <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
     </DefineStaticWebAssets>
   </Target>
+
 </Project>
diff --git a/src/Blogifier.Admin/assets/gulpfile.mjs b/src/Blogifier.Admin/assets/gulpfile.mjs
index 8678d8159..47ba6db96 100644
--- a/src/Blogifier.Admin/assets/gulpfile.mjs
+++ b/src/Blogifier.Admin/assets/gulpfile.mjs
@@ -160,7 +160,7 @@ const scss = () => {
 }
 
 const watcher = () => {
-  watch('./js/**/*.js', series(blogifierJs));
+  watch('./js/**/*.js', series(blogifierJs, editorJs));
   watch('./scss/**/*.scss', series(scss));
 };
 
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml
index bf2c8cfce..ac79f4d21 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml
@@ -99,10 +99,8 @@
   <p class="message">@_localizer["page-not-found-message"]</p>
   <p>
     <a class="button" href="~/">
-      <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor"
-           viewBox="0 0 16 16">
-        <path fill-rule="evenodd"
-              d="M12 8a.5.5 0 0 1-.5.5H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5a.5.5 0 0 1 .5.5z" />
+      <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 16 16">
+        <path fill-rule="evenodd" d="M12 8a.5.5 0 0 1-.5.5H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5a.5.5 0 0 1 .5.5z" />
       </svg>
       @_localizer["home"]
     </a>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/footer.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/footer.cshtml
index 82482dd73..0dab9d39c 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/footer.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/footer.cshtml
@@ -1,13 +1,11 @@
 @inject IStringLocalizer<Resource> _localizer
 @model MainModel
 
-<div class="modal fade search-modal" id="searchModal" tabindex="-1" aria-labelledby="searchModalLabel"
-     aria-hidden="true">
+<div class="modal fade search-modal" id="searchModal" tabindex="-1" aria-labelledby="searchModalLabel" aria-hidden="true">
   <div class="modal-dialog mt-5">
     <div class="modal-content">
       <form id="searchForm" class="search-form" asp-controller="search" asp-action="" method="post">
-        <input type="search" id="searchFormInput" name="term" class="form-control form-control-lg border-0 shadow-none"
-               placeholder="@_localizer["search"]..." autocomplete="off" autofocus>
+        <input type="search" id="searchFormInput" name="term" class="form-control form-control-lg border-0 shadow-none" placeholder="@_localizer["search"]..." autocomplete="off" autofocus>
       </form>
     </div>
   </div>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml
index 2a87c7249..e3d4f9860 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml
@@ -11,7 +11,7 @@
       <button class="header-nav-link" type="button" id="mainNav" data-bs-toggle="dropdown" aria-expanded="false">
         <span class="me-1">@_localizer["categories"]</span>
         <svg width="16" height="16" class="bi bi-chevron-down">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#categories"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#categories"></use>
         </svg>
       </button>
       <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="mainNav">
@@ -31,35 +31,35 @@
     <li>
       <a class="social-link-github header-nav-button" href="https://github.com/" target="_blank" aria-label="@_localizer["github"]">
         <svg width="16" height="16" class="bi bi-github">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#github"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#github"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-twitter header-nav-button" href="https://twitter.com/" target="_blank" aria-label="@_localizer["twitter"]">
         <svg width="16" height="16" class="bi bi-twitter">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#twitter"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#twitter"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-facebook header-nav-button" href="https://facebook.com" target="_blank" aria-label="@_localizer["facebook"]">
         <svg width="16" height="16" class="bi bi-facebook">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#facebook"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#facebook"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-youtube header-nav-button" href="https://youtube.com/" target="_blank" aria-label="@_localizer["youtube"]">
         <svg width="16" height="16" class="bi bi-youtube">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#youtube"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#youtube"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-instagram header-nav-button" href="https://instagram.com/" target="_blank" aria-label="@_localizer["instagram"]">
         <svg width="16" height="16" class="bi bi-instagram">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#instagram"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#instagram"></use>
         </svg>
       </a>
     </li>
@@ -68,7 +68,7 @@
   <!-- Search button -->
   <button aria-label="@_localizer["search"]" class="header-nav-button d-none d-md-block" type="button" data-bs-toggle="modal" data-bs-target="#searchModal">
     <svg width="16" height="16" class="bi bi-search">
-      <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#search"></use>
+      <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#search"></use>
     </svg>
   </button>
   <!--/Search button -->
@@ -76,11 +76,10 @@
   @if (Model.Main.Claims != null)
   {
     <div class="dropdown">
-      <button class="header-nav-link -login ms-4" title="@_localizer["login"]" id="dropdownMenuButton"
-              data-bs-toggle="dropdown" aria-expanded="false" aria-label="Admin Menu - John">
+      <button class="header-nav-link -login ms-4" title="@_localizer["login"]" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Admin Menu - John">
         <span class="me-1 d-none d-md-inline">@Model.Main.Claims.NickName</span>
         <svg width="16" height="16" class="bi bi-chevron-down">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#chevron-down"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#chevron-down"></use>
         </svg>
       </button>
       <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuButton">
@@ -100,7 +99,7 @@
   {
     <a class="header-nav-button -login ms-4" href="~/account" title="@_localizer["login"]" aria-label="@_localizer["login"]" role="button">
       <svg width="20" height="20" class="bi bi-box-arrow-in-right">
-        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#box-arrow-in-right"></use>
+        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#box-arrow-in-right"></use>
       </svg>
     </a>
   }
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/pagination.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/pagination.cshtml
index 069d79edb..43885982a 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/pagination.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/pagination.cshtml
@@ -8,8 +8,8 @@
     {
       <li class="pagination-item">
         <a class="pagination-link -prev" href="@Model.Pager.LinkToOlder" title="@_localizer["next-page"]">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+          <svg width="16" height="16" class="bi bi-arrow-left">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
           </svg>
           @_localizer["previous"]
         </a>
@@ -20,8 +20,8 @@
       <li class="pagination-item">
         <a class="pagination-link -next" href="@Model.Pager.LinkToNewer" title="@_localizer["previous-page"]">
           @_localizer["next"]
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-right" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M1 8a.5.5 0 0 1 .5-.5h11.793l-3.147-3.146a.5.5 0 0 1 .708-.708l4 4a.5.5 0 0 1 0 .708l-4 4a.5.5 0 0 1-.708-.708L13.293 8.5H1.5A.5.5 0 0 1 1 8z" />
+          <svg width="16" height="16" class="bi bi-arrow-right">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-right"></use>
           </svg>
         </a>
       </li>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml
index 038e32fae..201dbb63d 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml
@@ -13,19 +13,15 @@
 
 <body>
   <main class="blogifier">
-    <a class="account-back link-secondary" href="/" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]"
-       data-placement="right">
-      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi bi-arrow-left"
-           viewBox="0 0 16 16">
-        <path fill-rule="evenodd"
-              d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+    <a class="account-back link-secondary" href="/" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]" data-placement="right">
+      <svg width="24" height="24" class="bi bi-arrow-left">
+        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
       </svg>
     </a>
     <div class="account">
-      <a class="account-logo link-blogifier" href="http://blogifier.net/" target="_blank" rel="nofollow external"
-         data-bs-toggle="tooltip" title="@_localizer["powered-by-blogifier"]">
-        <svg width="40" height="40" fill="currentColor" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-          <path d="M179.2 0H102.4L81.92 51.2H166.4C180.538 51.2 192 62.6615 192 76.8C192 90.9385 180.538 102.4 166.4 102.4H61.44L40.96 153.6L166.4 153.6C180.538 153.6 192 165.062 192 179.2C192 193.338 180.538 204.8 166.4 204.8H20.48L0 256H179.2C221.615 256 256 221.615 256 179.2C256 159.53 248.605 141.587 236.444 128C248.605 114.413 256 96.4699 256 76.8C256 34.3845 221.615 0 179.2 0Z" />
+      <a class="account-logo link-blogifier" href="http://blogifier.net/" target="_blank" rel="nofollow external" data-bs-toggle="tooltip" title="@_localizer["powered-by-blogifier"]">
+        <svg width="40" height="40">
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#logo"></use>
         </svg>
       </a>
       @RenderBody()
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml
index 99426cead..27cbb22da 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml
@@ -15,9 +15,8 @@
 <body>
   <main class="blogifier">
     <a class="account-back link-secondary" href="@Model.RedirectUri" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]" data-placement="right">
-      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi bi-arrow-left"
-           viewBox="0 0 16 16">
-        <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+      <svg width="24" height="24" class="bi bi-arrow-left">
+        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
       </svg>
     </a>
     <div class="container profile">
@@ -25,8 +24,8 @@
         <div class="sidebar">
           <button class="sidebar-toggle d-lg-none">
             Page Title
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-down" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z" />
+            <svg width="16" height="16" class="bi bi-chevron-down">
+              <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-chevron-down"></use>
             </svg>
           </button>
           <div class="sidebar-nav d-lg-block">
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml
index fa9b93cad..81f970c42 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml
@@ -20,15 +20,15 @@
           <time class="post-meta-date-time">@DateTimeHelper.ToFriendlyShortDateString(Model.PostSlug.Post.PublishedAt)</time>
         </div>
         <button class="post-meta-btn ms-auto" type="button" data-bs-toggle="modal" data-bs-target="#shareModal">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-share" viewBox="0 0 16 16">
-            <path d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.499 2.499 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5zm-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z" />
+          <svg width="16" height="16" class="bi bi-share">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-share"></use>
           </svg>
         </button>
         @if (User.Identity != null && User.Identity.IsAuthenticated)
         {
           <a class="post-meta-btn ms-2" href="~/admin/pages/editor/@Model.PostSlug.Post.Slug">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil" viewBox="0 0 16 16">
-              <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z" />
+            <svg width="16" height="16" class="bi bi-pencil">
+              <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-pencil"></use>
             </svg>
           </a>
         }
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml
index 3cff72ca3..2653b2aa7 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml
@@ -39,20 +39,16 @@
             </ul>
           </div>
         }
-        <button class="post-meta-btn ms-auto" type="button" data-bs-toggle="modal" data-bs-target="#shareModal"
-                aria-label="@_localizer["share"]">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-share"
-               viewBox="0 0 16 16">
-            <path d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.499 2.499 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5zm-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z" />
+        <button class="post-meta-btn ms-auto" type="button" data-bs-toggle="modal" data-bs-target="#shareModal" aria-label="@_localizer["share"]">
+          <svg width="16" height="16" class="bi bi-share">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-share"></use>
           </svg>
         </button>
         @if (User.Identity != null && User.Identity.IsAuthenticated)
         {
-          <a class="post-meta-btn ms-2" href="~/admin/blogs/editor/@Model.PostSlug.Post.Slug" role="button"
-             aria-label="@_localizer["edit-post"]">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil"
-                 viewBox="0 0 16 16">
-              <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z" />
+          <a class="post-meta-btn ms-2" href="~/admin/blogs/editor/@Model.PostSlug.Post.Slug" role="button" aria-label="@_localizer["edit-post"]">
+            <svg width="16" height="16" class="bi bi-pencil">
+              <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-pencil"></use>
             </svg>
           </a>
         }
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml
index 7f143b409..2fb627ca6 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml
@@ -30,25 +30,20 @@
                 </h2>
                 <div class="featured-meta d-none d-md-flex">
                   <div class="featured-author">
-                    <img class="featured-author-img"
-                         src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 250 250' width='250' height='250'%3E%3Crect width='250' height='250' fill='%23622aff'%3E%3C/rect%3E%3Ctext x='50%' y='53%' dominant-baseline='middle' text-anchor='middle' font-family='Arial, sans-serif' font-size='128px' fill='%23ffffff'%3EA%3C/text%3E%3C/svg%3E"
-                         width="16" height="16" alt="John Doe">
+                    <img class="featured-author-img" src="@UserHelper.CheckGetAvatarUrl(item.User.Avatar)" width="16" height="16" alt="@item.User.NickName">
                     <span class="featured-author-name">@item.User.NickName</span>
                   </div>
                   <div class="featured-date">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor"
-                         class="bi bi-calendar-event featured-date-icon" viewBox="0 0 16 16">
-                      <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z" />
-                      <path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5zM1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4H1z" />
+                    <svg width="13" height="13" class="bi bi-calendar-event featured-date-icon">
+                      <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-calendar-event"></use>
                     </svg>
                     <time class="featured-date-time">@DateTimeHelper.ToFriendlyShortDateString(item.PublishedAt)</time>
                   </div>
                   @if (item.Categories != null)
                   {
                     <div class="featured-cat">
-                      <svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" fill="currentColor"
-                           class="bi bi-hash featured-cat-icon" viewBox="0 0 16 16">
-                        <path d="M8.39 12.648a1.32 1.32 0 0 0-.015.18c0 .305.21.508.5.508.266 0 .492-.172.555-.477l.554-2.703h1.204c.421 0 .617-.234.617-.547 0-.312-.188-.53-.617-.53h-.985l.516-2.524h1.265c.43 0 .618-.227.618-.547 0-.313-.188-.524-.618-.524h-1.046l.476-2.304a1.06 1.06 0 0 0 .016-.164.51.51 0 0 0-.516-.516.54.54 0 0 0-.539.43l-.523 2.554H7.617l.477-2.304c.008-.04.015-.118.015-.164a.512.512 0 0 0-.523-.516.539.539 0 0 0-.531.43L6.53 5.484H5.414c-.43 0-.617.22-.617.532 0 .312.187.539.617.539h.906l-.515 2.523H4.609c-.421 0-.609.219-.609.531 0 .313.188.547.61.547h.976l-.516 2.492c-.008.04-.015.125-.015.18 0 .305.21.508.5.508.265 0 .492-.172.554-.477l.555-2.703h2.242l-.515 2.492zm-1-6.109h2.266l-.515 2.563H6.859l.532-2.563z" />
+                      <svg width="17" height="17" class="bi bi-hash featured-cat-icon">
+                        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-hash"></use>
                       </svg>
                       @foreach (var cat in item.Categories)
                       {
@@ -62,10 +57,8 @@
                 </p>
                 <a class="featured-more" href="~/post/@item.Slug">
                   Read More
-                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-right"
-                       viewBox="0 0 16 16">
-                    <path fill-rule="evenodd"
-                          d="M1 8a.5.5 0 0 1 .5-.5h11.793l-3.147-3.146a.5.5 0 0 1 .708-.708l4 4a.5.5 0 0 1 0 .708l-4 4a.5.5 0 0 1-.708-.708L13.293 8.5H1.5A.5.5 0 0 1 1 8z" />
+                  <svg width="16" height="16" class="bi bi-arrow-right">
+                    <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-right"></use>
                   </svg>
                 </a>
               </section>
@@ -73,17 +66,14 @@
           </div>
         }
       }
-
     </div>
-    <button class="carousel-control-next featured-next d-none d-xl-block" type="button" data-bs-target="#carouselFeatured"
-            data-bs-slide="next">
+@*    <button class="carousel-control-next featured-next d-none d-xl-block" type="button" data-bs-target="#carouselFeatured" data-bs-slide="next">
       <span class="carousel-control-next-icon" aria-hidden="true"></span>
       <span class="visually-hidden">Next</span>
     </button>
-    <button class="carousel-control-prev featured-prev d-none d-xl-block" type="button" data-bs-target="#carouselFeatured"
-            data-bs-slide="prev">
+    <button class="carousel-control-prev featured-prev d-none d-xl-block" type="button" data-bs-target="#carouselFeatured" data-bs-slide="prev">
       <span class="carousel-control-prev-icon" aria-hidden="true"></span>
       <span class="visually-hidden">Previous</span>
-    </button>
+    </button>*@
   </div>
 }
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml
index 120da3f0a..c74685109 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml
@@ -18,10 +18,8 @@
       <h3 class="related-header-title">Related Posts</h3>
       <a class="related-header-link ms-auto" href="~/">
         View All
-        <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="currentColor" class="bi bi-arrow-right"
-          viewBox="0 0 16 16">
-          <path fill-rule="evenodd"
-            d="M1 8a.5.5 0 0 1 .5-.5h11.793l-3.147-3.146a.5.5 0 0 1 .708-.708l4 4a.5.5 0 0 1 0 .708l-4 4a.5.5 0 0 1-.708-.708L13.293 8.5H1.5A.5.5 0 0 1 1 8z" />
+        <svg width="22" height="22" class="bi bi-arrow-left">
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
         </svg>
       </a>
     </header>
@@ -54,20 +52,15 @@
                 <span class="post-grid-author-name">@post.User.NickName</span>
               </div>
               <div class="post-grid-date">
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor"
-                  class="bi bi-calendar-event post-grid-date-icon" viewBox="0 0 16 16">
-                  <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z" />
-                  <path
-                    d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5zM1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4H1z" />
+                <svg width="13" height="13" class="bi bi-calendar-event post-grid-date-icon">
+                  <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-calendar-event"></use>
                 </svg>
                 <time class="post-grid-date-time">@DateTimeHelper.ToFriendlyShortDateString(post.PublishedAt)</time>
               </div>
               <a class="post-grid-more ms-auto" href="~/post/@post.Slug" tabindex="-1">
                 <span>Read</span>
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                  class="bi bi-arrow-right-short" viewBox="0 0 16 16">
-                  <path fill-rule="evenodd"
-                    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" />
+                <svg width="16" height="16" class="bi bi-arrow-right-short">
+                  <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-calendar-event"></use>
                 </svg>
               </a>
             </div>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/share.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/share.cshtml
index ee8d3551e..ad7517d2a 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/share.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/share.cshtml
@@ -18,30 +18,24 @@
         <ul class="share-modal-list row g-3">
           <li class="col">
             <a class="share-modal-link -facebook" href="@share_facebook" target="_blank">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                class="bi bi-facebook share-modal-link-icon" viewBox="0 0 16 16">
-                <path
-                  d="M16 8.049c0-4.446-3.582-8.05-8-8.05C3.58 0-.002 3.603-.002 8.05c0 4.017 2.926 7.347 6.75 7.951v-5.625h-2.03V8.05H6.75V6.275c0-2.017 1.195-3.131 3.022-3.131.876 0 1.791.157 1.791.157v1.98h-1.009c-.993 0-1.303.621-1.303 1.258v1.51h2.218l-.354 2.326H9.25V16c3.824-.604 6.75-3.934 6.75-7.951z" />
+              <svg width="16" height="16" class="bi bi-facebook share-modal-link-icon">
+                <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#github"></use>
               </svg>
               <span class="share-modal-link-label">Facebook</span>
             </a>
           </li>
           <li class="col bft-share-item">
             <a class="share-modal-link -twitter" href="@share_twitter" target="_blank">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                class="bi bi-twitter share-modal-link-icon" viewBox="0 0 16 16">
-                <path
-                  d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z" />
+              <svg width="16" height="16" class="bi bi-twitter share-modal-link-icon">
+                <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#twitter"></use>
               </svg>
               <span class="share-modal-link-label">Twitter</span>
             </a>
           </li>
           <li class="col bft-share-item">
             <a class="share-modal-link" href="@share_email" target="_blank">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                class="bi bi-envelope-fill share-modal-link-icon" viewBox="0 0 16 16">
-                <path
-                  d="M.05 3.555A2 2 0 0 1 2 2h12a2 2 0 0 1 1.95 1.555L8 8.414.05 3.555zM0 4.697v7.104l5.803-3.558L0 4.697zM6.761 8.83l-6.57 4.027A2 2 0 0 0 2 14h12a2 2 0 0 0 1.808-1.144l-6.57-4.027L8 9.586l-1.239-.757zm3.436-.586L16 11.801V4.697l-5.803 3.546z" />
+              <svg width="16" height="16" class="bi bi-envelope-fill share-modal-link-icon">
+                <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-envelope-fill"></use>
               </svg>
               <span class="share-modal-link-label">Email</span>
             </a>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml
index 36dd9c5c7..772f13e33 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml
@@ -31,19 +31,15 @@
               <span class="post-grid-author-name">@post.User.NickName</span>
             </div>
             <div class="post-grid-date">
-              <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor"
-                   class="bi bi-calendar-event post-grid-date-icon" viewBox="0 0 16 16">
-                <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z" />
-                <path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5zM1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4H1z" />
+              <svg width="13" height="13" class="bi bi-calendar-event post-grid-date-icon">
+                <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-calendar-event"></use>
               </svg>
               <time class="post-grid-date-time">@DateTimeHelper.ToFriendlyShortDateString(post.PublishedAt)</time>
             </div>
             <a class="post-grid-more ms-auto" href="~/post/@post.Slug" tabindex="-1">
               <span>Read</span>
-              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                   class="bi bi-arrow-right-short" viewBox="0 0 16 16">
-                <path fill-rule="evenodd"
-                      d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" />
+              <svg width="16" height="16" class="bi bi-arrow-right-short">
+                <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-right-short"></use>
               </svg>
             </a>
           </div>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml
index d3e96bc11..bccb59e95 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml
@@ -20,19 +20,16 @@
             <span class="post-list-author-name">@post.User.NickName</span>
           </div>
           <div class="post-list-meta-item post-list-date">
-            <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor"
-                 class="bi bi-calendar-event post-list-date-icon" viewBox="0 0 16 16">
-              <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z" />
-              <path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5zM1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4H1z" />
+            <svg width="13" height="13" class="bi bi-calendar-event post-list-date-icon">
+              <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-calendar-event"></use>
             </svg>
             <time class="post-list-date-time">@DateTimeHelper.ToFriendlyShortDateString(post.PublishedAt)</time>
           </div>
           @if (post.Categories != null)
           {
             <div class="post-list-meta-item post-list-cat">
-              <svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" fill="currentColor"
-                   class="bi bi-hash post-list-cat-icon" viewBox="0 0 16 16">
-                <path d="M8.39 12.648a1.32 1.32 0 0 0-.015.18c0 .305.21.508.5.508.266 0 .492-.172.555-.477l.554-2.703h1.204c.421 0 .617-.234.617-.547 0-.312-.188-.53-.617-.53h-.985l.516-2.524h1.265c.43 0 .618-.227.618-.547 0-.313-.188-.524-.618-.524h-1.046l.476-2.304a1.06 1.06 0 0 0 .016-.164.51.51 0 0 0-.516-.516.54.54 0 0 0-.539.43l-.523 2.554H7.617l.477-2.304c.008-.04.015-.118.015-.164a.512.512 0 0 0-.523-.516.539.539 0 0 0-.531.43L6.53 5.484H5.414c-.43 0-.617.22-.617.532 0 .312.187.539.617.539h.906l-.515 2.523H4.609c-.421 0-.609.219-.609.531 0 .313.188.547.61.547h.976l-.516 2.492c-.008.04-.015.125-.015.18 0 .305.21.508.5.508.265 0 .492-.172.554-.477l.555-2.703h2.242l-.515 2.492zm-1-6.109h2.266l-.515 2.563H6.859l.532-2.563z" />
+              <svg width="17" height="17" class="bi bi-hash post-list-cat-icon">
+                <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-hash"></use>
               </svg>
               @foreach (var cat in post.Categories)
               {
@@ -44,10 +41,8 @@
         <p class="post-list-desc">@Html.Raw(post.Description)</p>
         <a class="post-list-more" href="~/post/@post.Slug" tabindex="-1">
           Read More
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-right"
-               viewBox="0 0 16 16">
-            <path fill-rule="evenodd"
-                  d="M1 8a.5.5 0 0 1 .5-.5h11.793l-3.147-3.146a.5.5 0 0 1 .708-.708l4 4a.5.5 0 0 1 0 .708l-4 4a.5.5 0 0 1-.708-.708L13.293 8.5H1.5A.5.5 0 0 1 1 8z" />
+          <svg width="16" height="16" class="bi bi-arrow-right">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-right"></use>
           </svg>
         </a>
       </section>
diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml
index a878b952c..60a91ef2d 100644
--- a/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml
+++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml
@@ -23,14 +23,13 @@
       <div class="d-flex">
         <img src="~/@UserHelper.CheckGetAvatarUrl(Model.Avatar)" width="39" height="39" class="profilePicture rounded me-3" alt="@Model.NickName" />
         <button class="btn btn-link" onclick="return fileManager.uploadClick('@UploadType.Avatar');" type="button" title="@_localizer["upload"]" data-bs-toggle="tooltip">
-          <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-arrow-up-circle" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M1 8a7 7 0 1 0 14 0A7 7 0 0 0 1 8zm15 0A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-7.5 3.5a.5.5 0 0 1-1 0V5.707L5.354 7.854a.5.5 0 1 1-.708-.708l3-3a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708L8.5 5.707V11.5z" />
+          <svg width="18" height="18" class="bi bi-arrow-up-circle">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-up-circle"></use>
           </svg>
         </button>
         <button class="btn btn-link" type="button" title="@_localizer["reset"]" data-bs-toggle="tooltip">
-          <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-x-circle" viewBox="0 0 16 16">
-            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-            <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
+          <svg width="18" height="18" class="bi bi-x-circle">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-x-circle"></use>
           </svg>
         </button>
       </div>
diff --git a/src/Blogifier.Themes.Standard/assets/gulpfile.mjs b/src/Blogifier.Themes.Standard/assets/gulpfile.mjs
index d1204841d..5dcc1d51e 100644
--- a/src/Blogifier.Themes.Standard/assets/gulpfile.mjs
+++ b/src/Blogifier.Themes.Standard/assets/gulpfile.mjs
@@ -4,7 +4,6 @@ import { deleteAsync } from 'del';
 
 import gulp from 'gulp';
 import plumber from 'gulp-plumber';
-import size from 'gulp-size';
 import uglify from 'gulp-uglify';
 import sourcemaps from 'gulp-sourcemaps';
 
@@ -126,11 +125,12 @@ const svgSprite = () => {
       }
     })
   );
-  return stream.pipe(dest('dist/images'));
+  return stream.pipe(dest('dist/img'));
 }
 
 const watcher = () => {
   watch('./js/**/*.js', series(rollupJs));
+  watch('./scss/**/*.scss', series(scss));
 };
 
 export default series(
diff --git a/src/Blogifier.Themes.Standard/assets/scss/layout/_nav.scss b/src/Blogifier.Themes.Standard/assets/scss/layout/_nav.scss
index e699eddb5..db7d79d56 100644
--- a/src/Blogifier.Themes.Standard/assets/scss/layout/_nav.scss
+++ b/src/Blogifier.Themes.Standard/assets/scss/layout/_nav.scss
@@ -24,6 +24,7 @@
       color: #000;
       background-color: var(--bs-light);
     }
+
     > .bi,
     > img {
       transform: translateY(-0.1rem);
@@ -33,11 +34,13 @@
   &-link {
     padding: 0 1rem;
     font-weight: 500;
+
     .bi-chevron-down {
       width: 0.75rem;
       height: 0.75rem;
     }
   }
+
   &-button {
     padding: 0;
     width: 2.5rem;
@@ -45,6 +48,7 @@
 
   .-login {
     position: relative;
+
     &::after {
       content: "";
       width: 1px;
@@ -56,15 +60,21 @@
       background-color: rgba(#000, 0.1);
       display: block;
     }
+
     .bi-box-arrow-in-right {
       transform: translateX(-0.125rem);
     }
   }
+
   @media (max-width: 767px) {
     border-bottom: 1px solid rgba(#000, 0.03);
     border-top: 1px solid rgba(#000, 0.03);
     padding: 0.25rem 0.75rem;
     margin: 0 -1.5rem 1rem;
+
+    &-link {
+      padding: 0 0 0 1rem;
+    }
   }
 }
 
diff --git a/src/Blogifier.Themes.Standard/assets/svg/box-arrow-in-right.svg b/src/Blogifier.Themes.Standard/assets/svg/box-arrow-in-right.svg
deleted file mode 100644
index 8110e3eac..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/box-arrow-in-right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"  viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M6 3.5a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v9a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-2a.5.5 0 0 0-1 0v2A1.5 1.5 0 0 0 6.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-8A1.5 1.5 0 0 0 5 3.5v2a.5.5 0 0 0 1 0v-2z" />
-  <path fill-rule="evenodd" d="M11.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H1.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/categories.svg b/src/Blogifier.Themes.Standard/assets/svg/categories.svg
deleted file mode 100644
index ab37cb450..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/categories.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"  viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/chevron-down.svg b/src/Blogifier.Themes.Standard/assets/svg/chevron-down.svg
deleted file mode 100644
index ab37cb450..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/chevron-down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"  viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/facebook.svg b/src/Blogifier.Themes.Standard/assets/svg/facebook.svg
deleted file mode 100644
index 17de23073..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/facebook.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">
-  <path d="M16 8.049c0-4.446-3.582-8.05-8-8.05C3.58 0-.002 3.603-.002 8.05c0 4.017 2.926 7.347 6.75 7.951v-5.625h-2.03V8.05H6.75V6.275c0-2.017 1.195-3.131 3.022-3.131.876 0 1.791.157 1.791.157v1.98h-1.009c-.993 0-1.303.621-1.303 1.258v1.51h2.218l-.354 2.326H9.25V16c3.824-.604 6.75-3.934 6.75-7.951z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/github.svg b/src/Blogifier.Themes.Standard/assets/svg/github.svg
deleted file mode 100644
index 4332ee295..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/github.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"  viewBox="0 0 16 16">
-  <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/instagram.svg b/src/Blogifier.Themes.Standard/assets/svg/instagram.svg
deleted file mode 100644
index 1ed213920..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/instagram.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">
-   <path d="M8 0C5.829 0 5.556.01 4.703.048 3.85.088 3.269.222 2.76.42a3.917 3.917 0 0 0-1.417.923A3.927 3.927 0 0 0
-.42 2.76C.222 3.268.087 3.85.048 4.7.01 5.555 0 5.827 0 8.001c0 2.172.01 2.444.048 3.297.04.852.174 1.433.372
-1.942.205.526.478.972.923 1.417.444.445.89.719 1.416.923.51.198 1.09.333 1.942.372C5.555 15.99 5.827 16 8
-16s2.444-.01 3.298-.048c.851-.04 1.434-.174 1.943-.372a3.916 3.916 0 0 0
-1.416-.923c.445-.445.718-.891.923-1.417.197-.509.332-1.09.372-1.942C15.99 10.445 16 10.173 16
-8s-.01-2.445-.048-3.299c-.04-.851-.175-1.433-.372-1.941a3.926 3.926 0 0 0-.923-1.417A3.911 3.911 0 0 0
-13.24.42c-.51-.198-1.092-.333-1.943-.372C10.443.01 10.172 0 7.998 0h.003zm-.717 1.442h.718c2.136 0 2.389.007
-3.232.046.78.035 1.204.166 1.486.275.373.145.64.319.92.599.28.28.453.546.598.92.11.281.24.705.275 1.485.039.843.047
-1.096.047 3.231s-.008 2.389-.047 3.232c-.035.78-.166 1.203-.275 1.485a2.47 2.47 0 0
-1-.599.919c-.28.28-.546.453-.92.598-.28.11-.704.24-1.485.276-.843.038-1.096.047-3.232.047s-2.39-.009-3.233-.047c-.78-.036-1.203-.166-1.485-.276a2.478
-2.478 0 0 1-.92-.598 2.48 2.48 0 0 1-.6-.92c-.109-.281-.24-.705-.275-1.485-.038-.843-.046-1.096-.046-3.233
-0-2.136.008-2.388.046-3.231.036-.78.166-1.204.276-1.486.145-.373.319-.64.599-.92.28-.28.546-.453.92-.598.282-.11.705-.24
-1.485-.276.738-.034 1.024-.044 2.515-.045v.002zm4.988 1.328a.96.96 0 1 0 0 1.92.96.96 0 0 0 0-1.92zm-4.27
-1.122a4.109 4.109 0 1 0 0 8.217 4.109 4.109 0 0 0 0-8.217zm0 1.441a2.667 2.667 0 1 1 0 5.334 2.667 2.667 0 0 1
-0-5.334z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/search.svg b/src/Blogifier.Themes.Standard/assets/svg/search.svg
deleted file mode 100644
index eecd79338..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/search.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">
-  <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/twitter.svg b/src/Blogifier.Themes.Standard/assets/svg/twitter.svg
deleted file mode 100644
index f4ce398c9..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/twitter.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"  fill="currentColor"  viewBox="0 0 16 16">
-  <path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z" />
-</svg>
diff --git a/src/Blogifier.Themes.Standard/assets/svg/youtube.svg b/src/Blogifier.Themes.Standard/assets/svg/youtube.svg
deleted file mode 100644
index 127459571..000000000
--- a/src/Blogifier.Themes.Standard/assets/svg/youtube.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">
-  <path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082
-    2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.007 2.007 0 0 1-1.415
-    1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309
-    0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.007 2.007 0 0
-    1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31.4 31.4 0 0 1 0 7.68v-.122C.002 7.343.01 6.6.064
-    5.78l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.007 2.007 0 0 1 1.415-1.42c.487-.13
-    1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A99.788 99.788 0 0 1 7.858 2h.193zM6.4
-    5.209v4.818l4.157-2.408L6.4 5.209z" />
-</svg>
diff --git a/src/Blogifier/Posts/PostProvider.cs b/src/Blogifier/Posts/PostProvider.cs
index 5b5993ac6..586a2583a 100644
--- a/src/Blogifier/Posts/PostProvider.cs
+++ b/src/Blogifier/Posts/PostProvider.cs
@@ -4,6 +4,7 @@
 using Blogifier.Extensions;
 using Blogifier.Helper;
 using Blogifier.Shared;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.EntityFrameworkCore;
 using ReverseMarkdown.Converters;
 using System;
@@ -241,8 +242,7 @@ public Task StateAsynct(IEnumerable<int> ids, PostState state)
   public async Task StateInternalAsynct(IQueryable<Post> query, PostState state)
   {
     await query.ExecuteUpdateAsync(setters =>
-        setters.SetProperty(b => b.State, state)
-        .SetProperty(b => b.PublishedAt, b => GetPublishedAt(b.PublishedAt, state)));
+        setters.SetProperty(b => b.State, state));
   }
 
   public async Task<string> AddAsync(PostEditorDto postInput, int userId)