diff --git a/assets/sass/_zen.scss b/assets/sass/_zen.scss
index 02d99ca..6d0c68d 100644
--- a/assets/sass/_zen.scss
+++ b/assets/sass/_zen.scss
@@ -196,17 +196,13 @@ figure {
     }
 
     &:active,
-    &.active {
+    &[aria-current] {
       background-color: var(--color-brand);
       text-decoration: underline;
     }
   }
 }
 
-.menu a.active {
-  text-decoration: none;
-}
-
 // Search
 
 .search-text {
diff --git a/assets/sass/base/links/_links.scss b/assets/sass/base/links/_links.scss
index c0d5611..76342ae 100644
--- a/assets/sass/base/links/_links.scss
+++ b/assets/sass/base/links/_links.scss
@@ -32,6 +32,12 @@ a:active {
   color: var(--color-link-active);
 }
 
+// Remove underline from links to current page to
+// indicate that there is no need to click on it.
+[aria-current] {
+  text-decoration: none;
+}
+
 .link-nav,
 %link-nav {
   a {
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 1684844..eb6296e 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -4,7 +4,7 @@
 
 {{ $currentPage := . -}}
 {{ range site.Menus.main -}}
-<li><a href="{{ .URL | relLangURL }}"{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} class="active" aria-current="page"{{ end }}>{{ .Pre }}<span>{{ .Name }}</span>{{ .Post }}</a></li>
+<li><a href="{{ .URL | relLangURL }}"{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} aria-current="page"{{ end }}>{{ .Pre }}<span>{{ .Name }}</span>{{ .Post }}</a></li>
 {{ end -}}
 
 {{ else -}}
@@ -12,12 +12,12 @@
 {{ $currentSection := .Section -}}
 {{ $currentID := "" -}}
 {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
-{{ with site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
+{{ with site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
 {{ range where site.RegularPages "Section" "" -}}
-<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
+<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
 {{ end -}}
 {{ range site.Sections -}}
-<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
+<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
 {{ end -}}
 
 {{ end -}}
diff --git a/layouts/partials/mobilemenu.html b/layouts/partials/mobilemenu.html
index a665295..d531437 100644
--- a/layouts/partials/mobilemenu.html
+++ b/layouts/partials/mobilemenu.html
@@ -16,7 +16,7 @@
 
     {{ $currentPage := . -}}
     {{ range site.Menus.main -}}
-    <li><a href="{{ .URL | relLangURL }}"{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} class="active" aria-current="page"{{ end }}>{{ .Pre }}<span>{{ .Name }}</span>{{ .Post }}</a></li>
+    <li><a href="{{ .URL | relLangURL }}"{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} aria-current="page"{{ end }}>{{ .Pre }}<span>{{ .Name }}</span>{{ .Post }}</a></li>
     {{ end -}}
 
     {{ else -}}
@@ -24,12 +24,12 @@
     {{ $currentSection := .Section -}}
     {{ $currentID := "" -}}
     {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
-    {{ with site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
+    {{ with site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
     {{ range where site.RegularPages "Section" "" -}}
-    <li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
+    <li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
     {{ end -}}
     {{ range site.Sections -}}
-    <li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
+    <li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
     {{ end -}}
 
     {{ end -}}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index de4d9f7..cf081ca 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -4,10 +4,10 @@
 <aside class="sidebar layout__second-sidebar">
 {{ range site.Sections -}}
 <section class="menu">
-<p class="title"><strong><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></strong></p>
+<p class="title"><strong><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .Title }}</a></strong></p>
 <ul>
 {{ range .Pages -}}
-<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
+<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
 {{ end -}}
 </ul>
 </section>