diff --git a/dist/base.html b/dist/base.html
index 0c0d4fd5..4a0c0e0e 100644
--- a/dist/base.html
+++ b/dist/base.html
@@ -104,13 +104,17 @@
     {% set features = config.theme.features or [] %}
     <input class="md-toggle" data-md-toggle="drawer" type="checkbox" id="__drawer" autocomplete="off">
     <input class="md-toggle" data-md-toggle="search" type="checkbox" id="__search" autocomplete="off">
-    <label class="md-overlay" for="__drawer"></label>
+    <label class="md-overlay" for="__drawer" aria-label="{{ lang.t('nav') }}"></label>
     <div data-md-component="skip">
       {% if page.toc | first is defined %}
         {% set skip = page.toc | first %}
         <a href="{{ skip.url | url }}" class="md-skip">
           {{ lang.t("action.skip") }}
         </a>
+      {% else %}
+        <a href="#__skip" class="md-skip">
+          {{ lang.t("action.skip") }}
+        </a>
       {% endif %}
     </div>
     <div data-md-component="announce">
diff --git a/dist/partials/content.html b/dist/partials/content.html
index 48c79c81..15184a98 100644
--- a/dist/partials/content.html
+++ b/dist/partials/content.html
@@ -3,7 +3,7 @@
 -#}
 {% include "partials/actions.html" %}
 {% if "\u003ch1" not in page.content %}
-  <h1>{{ page.title | d(config.site_name, true)}}</h1>
+  <h1 id="__skip">{{ page.title | d(config.site_name, true)}}</h1>
 {% endif %}
 {{ page.content }}
 {% include "partials/tags.html" %}
diff --git a/dist/partials/header.html b/dist/partials/header.html
index d8f255e1..b20b8615 100644
--- a/dist/partials/header.html
+++ b/dist/partials/header.html
@@ -12,7 +12,7 @@
     <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}" class="md-header__button md-logo" aria-label="{{ config.site_name }}" data-md-component="logo">
       {% include "partials/logo.html" %}
     </a>
-    <label class="md-header__button md-icon" for="__drawer">
+    <label class="md-header__button md-icon" for="__drawer" aria-label="{{ lang.t('nav') }}">
       {% set icon = config.theme.icon.menu or "material/menu" %}
       {% include ".icons/" ~ icon ~ ".svg" %}
     </label>
@@ -48,7 +48,7 @@
     {% if "search" in config.plugins %}
       {% set search = config.plugins["search"] | attr("config") %}
       {% if search.enabled %}
-        <label class="md-header__button md-icon" for="__search">
+        <label class="md-header__button md-icon" for="__search" aria-label="{{ lang.t('search') }}">
           {% set icon = config.theme.icon.search or "material/magnify" %}
           {% include ".icons/" ~ icon ~ ".svg" %}
         </label>
diff --git a/dist/partials/logo.html b/dist/partials/logo.html
index 6d80f2ce..f2743d69 100644
--- a/dist/partials/logo.html
+++ b/dist/partials/logo.html
@@ -2,7 +2,7 @@
   This file was automatically generated - do not edit
 -#}
 {% if config.theme.logo %}
-  <img src="{{ config.theme.logo | url }}" alt="logo">
+  <img src="{{ config.theme.logo | url }}" alt="{{ config.site_name }}">
 {% else %}
   {% set icon = config.theme.icon.logo or "material/library" %}
   {% include ".icons/" ~ icon ~ ".svg" %}
diff --git a/src/base.html b/src/base.html
index 62196946..00fed5e2 100644
--- a/src/base.html
+++ b/src/base.html
@@ -205,7 +205,10 @@
     />
 
     <!-- Overlay for expanded drawer -->
-    <label class="md-overlay" for="__drawer"></label>
+    <label
+      class="md-overlay" for="__drawer"
+      aria-label="{{ lang.t('nav') }}"
+    ></label>
 
     <!-- Skip to content -->
     <div data-md-component="skip">
@@ -214,6 +217,10 @@
         <a href="{{ skip.url | url }}" class="md-skip">
           {{ lang.t("action.skip") }}
         </a>
+      {% else %}
+        <a href="#__skip" class="md-skip">
+          {{ lang.t("action.skip") }}
+        </a>
       {% endif %}
     </div>
 
diff --git a/src/partials/content.html b/src/partials/content.html
index 28d173b4..2f22cb66 100644
--- a/src/partials/content.html
+++ b/src/partials/content.html
@@ -31,7 +31,7 @@
   page title (or respectively site name) is used as the main headline.
 -->
 {% if "\u003ch1" not in page.content %}
-  <h1>{{ page.title | d(config.site_name, true)}}</h1>
+  <h1 id="__skip">{{ page.title | d(config.site_name, true)}}</h1>
 {% endif %}
 
 <!-- Page content -->
diff --git a/src/partials/header.html b/src/partials/header.html
index 51ddf2d0..0421e08f 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -50,7 +50,10 @@
     </a>
 
     <!-- Button to open drawer -->
-    <label class="md-header__button md-icon" for="__drawer">
+    <label
+      class="md-header__button md-icon" for="__drawer"
+      aria-label="{{ lang.t('nav') }}"
+    >
       {% set icon = config.theme.icon.menu or "material/menu" %}
       {% include ".icons/" ~ icon ~ ".svg" %}
     </label>
@@ -98,7 +101,10 @@
 
       <!-- Check if search is actually enabled - see https://t.ly/DT_0V -->
       {% if search.enabled %}
-        <label class="md-header__button md-icon" for="__search">
+        <label
+          class="md-header__button md-icon" for="__search"
+          aria-label="{{ lang.t('search') }}"
+        >
           {% set icon = config.theme.icon.search or "material/magnify" %}
           {% include ".icons/" ~ icon ~ ".svg" %}
         </label>
diff --git a/src/partials/logo.html b/src/partials/logo.html
index e2e0ac31..500eadc6 100644
--- a/src/partials/logo.html
+++ b/src/partials/logo.html
@@ -25,7 +25,7 @@
 
 <!-- Logo -->
 {% if config.theme.logo %}
-  <img src="{{ config.theme.logo | url }}" alt="logo" />
+  <img src="{{ config.theme.logo | url }}" alt="{{ config.site_name }}" />
 {% else %}
   {% set icon = config.theme.icon.logo or "material/library" %}
   {% include ".icons/" ~ icon ~ ".svg" %}