diff --git a/Documentation/templates-src/NetCord/src/nav.ts b/Documentation/templates-src/NetCord/src/nav.ts
index ee16249cf..325e01ae7 100644
--- a/Documentation/templates-src/NetCord/src/nav.ts
+++ b/Documentation/templates-src/NetCord/src/nav.ts
@@ -3,7 +3,6 @@
 
 import AnchorJs from "anchor-js";
 import { render, html, nothing, TemplateResult } from "lit-html";
-// import { unsafeStatic,  } from 'lit-html/static.js'
 import { breakWordLit, meta, isExternalHref, loc, options } from "./helper";
 import { themePicker } from "./theme";
 import { TocNode } from "./toc";
@@ -71,13 +70,28 @@ export async function renderNavbar(): Promise<NavItem[]> {
     const iconsForm = html` <form class="icons">
       ${icons?.map(
         (i) =>
-          html`<a
-            class="btn border-0 icon-tooltip"
-            href="${i.href ?? nothing}"
-            @click="${i.onclick ?? nothing}"
-            tooltip="${i.tooltip}"
-            ><i class="${i.icon}"></i
-          ></a>`,
+        {
+          if (i.href) {
+            return html`<a
+              class="btn border-0 icon-tooltip"
+              href="${i.href}"
+              aria-label="${i.tooltip}"
+              tooltip="${i.tooltip}"
+              ><i class="${i.icon}"></i
+            ></a>`;
+          } else if (i.onclick) {
+            return html`<button
+              type="button"
+              class="btn border-0 icon-tooltip"
+              aria-label="${i.tooltip}"
+              @click="${i.onclick}"
+              tooltip="${i.tooltip}"
+              ><i class="${i.icon}"></i
+            ></button>`;
+          }
+
+          return nothing;
+        },
       )}
       ${await themePicker(renderCore)}
     </form>`;
diff --git a/Documentation/templates-src/NetCord/src/theme.ts b/Documentation/templates-src/NetCord/src/theme.ts
index b0461740f..fd995b740 100644
--- a/Documentation/templates-src/NetCord/src/theme.ts
+++ b/Documentation/templates-src/NetCord/src/theme.ts
@@ -48,12 +48,14 @@ export async function themePicker(refresh: () => void) {
   const theme = getTheme();
   const icon = theme === "light" ? "sun" : "moon";
 
-  return html`<a
+  return html`<button
+    type="button"
     class="btn border-0 icon-tooltip"
+    aria-label="Toggle theme"
     @click="${toggleTheme}"
     tooltip="Toggle theme"
     ><i class="bi bi-${icon}"></i
-  ></a>`;
+  ></button>`;
 
   function toggleTheme(e) {
     e.preventDefault();