diff --git a/assets/css/_partial/_header.scss b/assets/css/_partial/_header.scss
index 01249bd9..3d71c990 100644
--- a/assets/css/_partial/_header.scss
+++ b/assets/css/_partial/_header.scss
@@ -90,6 +90,7 @@
     position: absolute;
     left: auto;
     right: 1rem;
+    cursor: pointer;
   }
 
   .search-toggle {
@@ -141,6 +142,10 @@
   }
 }
 
+.theme-switch {
+  cursor: pointer;
+}
+
 .theme-switch i {
   @include transform(rotate(225deg));
 }
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
index 945bab86..179e3c0b 100644
--- a/layouts/_default/_markup/render-heading.html
+++ b/layouts/_default/_markup/render-heading.html
@@ -1 +1 @@
-<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="headerLink"><a href="#{{ .Anchor | safeURL }}" class="header-mark"></a>{{ .Text | safeHTML }}</h{{ .Level }}>
\ No newline at end of file
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="headerLink"><a href="#{{ .Anchor | safeURL }}" aria-label="{{ .Anchor | safeURL }}" class="header-mark"></a>{{ .Text | safeHTML }}</h{{ .Level }}>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 4ca3a6ea..092f45b0 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -72,20 +72,20 @@ <h2 class="display-hidden">Основная навигация</h2>
                 {{- if .Site.Params.search.enable -}}
                 <span class="menu-item search" id="search-desktop">
                         <input type="text" placeholder="{{ .Site.Params.search.placeholder | default (T `searchPlaceholder`) }}" id="search-input-desktop">
-                        <a href="javascript:void(0);" class="search-button search-toggle" id="search-toggle-desktop" title="{{ T `search` }}">
+                        <span class="search-button search-toggle" id="search-toggle-desktop" title="{{ T `search` }}">
                             <span class="svg-icon icon-search"></span>
-                        </a>
-                        <a href="javascript:void(0);" class="search-button search-clear" id="search-clear-desktop" title="{{ T `clear` }}">
+                        </span>
+                        <span class="search-button search-clear" id="search-clear-desktop" title="{{ T `clear` }}">
                             <span class="svg-icon icon-cancel"></span>
-                        </a>
+                        </span>
                         <span class="search-button search-loading" id="search-loading-desktop">
                             <span class="svg-icon icon-loading"></span>
                         </span>
                     </span>
                 {{- end -}}
-                <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
+                <span class="menu-item theme-switch" title="{{ T "switchTheme" }}">
                 <span class="svg-icon icon-moon"></span>
-                </a>
+                </span>
             </div>
         </div>
     </div>
@@ -129,19 +129,19 @@ <h2 class="display-hidden">Основная навигация</h2>
                     <div class="search-wrapper">
                         <div class="search mobile" id="search-mobile">
                             <input type="text" placeholder="{{ .Site.Params.search.placeholder | default (T `searchPlaceholder`) }}" id="search-input-mobile">
-                            <a href="javascript:void(0);" class="search-button search-toggle" id="search-toggle-mobile" title="{{ T `search` }}">
+                            <span class="search-button search-toggle" id="search-toggle-mobile" title="{{ T `search` }}">
                                 <span class="svg-icon icon-search"></span>
-                            </a>
-                            <a href="javascript:void(0);" class="search-button search-clear" id="search-clear-mobile" title="{{ T `clear` }}">
+                            </span>
+                            <span class="search-button search-clear" id="search-clear-mobile" title="{{ T `clear` }}">
                                 <span class="svg-icon icon-cancel"></span>
-                            </a>
+                            </span>
                             <span class="search-button search-loading" id="search-loading-mobile">
                                 <span class="svg-icon icon-loading"></span>
                             </span>
                         </div>
-                        <a href="javascript:void(0);" class="search-cancel" id="search-cancel-mobile">
+                        <span class="search-cancel" id="search-cancel-mobile">
                             {{ T `cancel` }}
-                        </a>
+                        </span>
                     </div>
                 {{- end -}}
                 {{- $currentPage := . -}}
@@ -161,9 +161,9 @@ <h2 class="display-hidden">Основная навигация</h2>
                         {{- end -}}
                     </ul>
                 </nav>
-                <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
+                <span class="menu-item theme-switch" title="{{ T "switchTheme" }}">
                     <span class="svg-icon icon-moon"></span>
-                </a>
+                </span>
                 {{- if .Site.IsMultiLingual -}}
                     <span onclick="javascript:void(0);" class="menu-item" title="{{ T "selectLanguage" }}">
                         {{- .Language.LanguageName -}}