diff --git a/sass/fontawesome/_path.scss b/sass/fontawesome/_path.scss
index bb3f36b70b6..c8deb15543b 100644
--- a/sass/fontawesome/_path.scss
+++ b/sass/fontawesome/_path.scss
@@ -11,4 +11,5 @@
 //  src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
+  font-display: swap;
 }
diff --git a/source/_includes/custom/features.html b/source/_includes/custom/features.html
index 641bea86204..9e2ff868878 100644
--- a/source/_includes/custom/features.html
+++ b/source/_includes/custom/features.html
@@ -110,6 +110,7 @@
       <a
         class="button"
         href="/home-energy-management/"
+        aria-label="Learn more about Home Energy Management"
       >
         LEARN MORE
       </a>
diff --git a/source/_includes/site/header.html b/source/_includes/site/header.html
index 490246171ff..7967ddd9427 100644
--- a/source/_includes/site/header.html
+++ b/source/_includes/site/header.html
@@ -48,7 +48,7 @@
           <li><a href="/blog/">Blog</a></li>
           <li><a href="/help/">Need help?</a></li>
           <li>
-            <a href="#" class="show-search"><i class="icon-search"></i></a>
+            <a href="#" class="show-search" aria-label="Show search" ><i class="icon-search"></i></a>
           </li>
         </ul>
       </nav>
diff --git a/source/index.html b/source/index.html
index 05626f7d4f6..cef6f7eecb1 100644
--- a/source/index.html
+++ b/source/index.html
@@ -59,7 +59,7 @@ feedback: false
         Use Alexa to control Home Assistant.
 
         <div class="links">
-          <a href="/cloud/">LEARN MORE</a>
+          <a href="/cloud/" aria-label="Learn more about use Alexa to control Home Assistant">LEARN MORE</a>
         </div>
       </div>
       <div class="material-card text">
@@ -67,7 +67,7 @@ feedback: false
         Use Google Assistant to control Home Assistant.
 
         <div class="links">
-          <a href="/cloud/">LEARN MORE</a>
+          <a href="/cloud/" aria-label="Learn more about use Google Assistant to control Home Assistant">LEARN MORE</a>
         </div>
       </div>
 
@@ -91,6 +91,7 @@ feedback: false
       <a
         class="material-card picture-promo"
         href="/state-of-the-open-home/"
+        aria-label="Learn more about State of the Open Home"
         style="
           padding-top: 56%;
           background: center/contain no-repeat url(/images/state-of-the-open-home/promo.png) #fff;