diff --git a/webcompat/templates/contributors.html b/webcompat/templates/contributors.html
index b109c8e35..92cc316fa 100644
--- a/webcompat/templates/contributors.html
+++ b/webcompat/templates/contributors.html
@@ -20,8 +20,8 @@ <h1 class="wc-Hero-title wc-Title--xl">Welcome aboard!<br/>Get started below...<
           <h2>
             <button class="contributors__item__btn is-active" type="button">
               How to Reproduce a Bug
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus"></span>
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus" aria-hidden="true"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus" aria-hidden="true"></span>
             </button>
           </h2>
         </div>
@@ -34,8 +34,8 @@ <h2>
           <h2>
             <button class="contributors__item__btn" type="button">
               How to Diagnose a Bug
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus"></span>
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus" aria-hidden="true"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus" aria-hidden="true"></span>
             </button>
           </h2>
         </div>
@@ -48,8 +48,8 @@ <h2>
           <h2>
             <button class="contributors__item__btn" type="button">
               How to Do Site Outreach
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus"></span>
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus" aria-hidden="true"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus" aria-hidden="true"></span>
             </button>
           </h2>
         </div>
@@ -62,8 +62,8 @@ <h2>
           <h2>
             <button class="contributors__item__btn" type="button">
               Contribute to this site
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus"></span>
-              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--disabled wc-Icon--minus" aria-hidden="true"></span>
+              <span class="wc-Icon wc-Icon--contributors wc-Icon--contributors--active wc-Icon--plus" aria-hidden="true"></span>
             </button>
           </h2>
         </div>
diff --git a/webcompat/templates/index.html b/webcompat/templates/index.html
index 5e53c33d0..03afbd691 100644
--- a/webcompat/templates/index.html
+++ b/webcompat/templates/index.html
@@ -8,8 +8,8 @@
       <h1 class="wc-Hero-title wc-Title--xl">Bug reporting <br>for the internet.</h1>
       <a id="report-bug" class="wc-Hero-link closed" href="{{ url_for("index") }}">
         Report bug
-        <span class="wc-Hero-link-icon wc-Hero-link-icon--default wc-Icon wc-Icon--arrow-right aria-hidden="true""></span>
-        <span class="wc-Hero-link-icon wc-Hero-link-icon--active wc-Icon wc-Icon--arrow-down aria-hidden="true""></span>
+        <span class="wc-Hero-link-icon wc-Hero-link-icon--default wc-Icon wc-Icon--arrow-right" aria-hidden="true"></span>
+        <span class="wc-Hero-link-icon wc-Hero-link-icon--active wc-Icon wc-Icon--arrow-down" aria-hidden="true"></span>
       </a>
     </div>
     <div class="wc-Hero-section wc-Hero-section--right">
diff --git a/webcompat/templates/issue.html b/webcompat/templates/issue.html
index 3d36f7ed0..b94cd0f9e 100644
--- a/webcompat/templates/issue.html
+++ b/webcompat/templates/issue.html
@@ -7,7 +7,7 @@ <h1 class="Issue-title wc-Title--l">
       <script type="text/template" id="title-tmpl">
         <a class="Issue-linkBack" href="{{ url_for("show_issues") }}" title="All issues">
 		  <span class="wc-sronly">All Issues</span>
-          <span class="Issue-linkBack-icon wc-Icon wc-Icon--arrow-left aria-hidden="true""></span>
+          <span class="Issue-linkBack-icon wc-Icon wc-Icon--arrow-left" aria-hidden="true"></span>
         </a>
         Issue <%= number %>: <%- title %>
       </script>
@@ -35,7 +35,7 @@ <h1 class="Issue-title wc-Title--l">
         <script type="text/template" id="issue-labels-tmpl">
           <span class="Label Label--title">Labels</span>
           {% if session.user_id and session.avatar_url %}
-            <span class="LabelEditor-wrapper"><button class="LabelEditor-launcher wc-Icon wc-Icon--gear aria-hidden="true""><span class="wc-sronly">Edit Labels</span></button></span>
+            <span class="LabelEditor-wrapper"><button class="LabelEditor-launcher wc-Icon wc-Icon--gear" aria-hidden="true"><span class="wc-sronly">Edit Labels</span></button></span>
           {% endif %}
           <span class="Label-list">
           <% _.each(labels, function(label) { %>
diff --git a/webcompat/templates/shared/nav.html b/webcompat/templates/shared/nav.html
index 7fa27e9e2..25fda3b8b 100644
--- a/webcompat/templates/shared/nav.html
+++ b/webcompat/templates/shared/nav.html
@@ -2,22 +2,22 @@
   <nav class="wc-content" role="navigation">
     <div class="wc-Navbar-section wc-Navbar-section--left">
       <a class="wc-Navbar-link" href="/">
-        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--home aria-hidden="true""></span><span class="wc-Navbar-link-label">Home</span>
+        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--home" aria-hidden="true"></span><span class="wc-Navbar-link-label">Home</span>
       </a>
     </div>
     <div class="wc-Navbar-section wc-Navbar-section--right">
       <a class="wc-Navbar-link" href="{{ url_for("show_issues") }}">
-        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--list aria-hidden="true""></span>
+        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--list" aria-hidden="true"></span>
         <span class="wc-Navbar-link-label">All issues</span>
       </a>
     {% if not session.user_id %}
       <a class="wc-Navbar-link js-login-link" href="{{ url_for('login') }}">
-        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right aria-hidden="true""></span>
+        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right" aria-hidden="true"></span>
         <span class="wc-Navbar-link-label">Log in</span>
       </a>
     {% else %}
       <a class="wc-Navbar-link js-login-link" href="{{ url_for('logout') }}">
-        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right aria-hidden="true""></span>
+        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right" aria-hidden="true"></span>
         <span class="wc-Navbar-link-label">Logout</span>
       </a>
       {% if session.user_id and session.avatar_url %}
diff --git a/webcompat/templates/topbar.html b/webcompat/templates/topbar.html
index 7116d6ec7..ba64f74e7 100644
--- a/webcompat/templates/topbar.html
+++ b/webcompat/templates/topbar.html
@@ -15,17 +15,17 @@
     </div>
     <div class="wc-Navbar-section wc-Navbar-section--right">
       <a class="wc-Navbar-link" href="{{ url_for("show_issues") }}">
-        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--list aria-hidden="true""></span>
+        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--list" aria-hidden="true"></span>
         <span class="wc-Navbar-link-label">All issues</span>
       </a>
       {% if not session.user_id %}
       <a class="wc-Navbar-link js-login-link" href="{{ url_for('login') }}">
-        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right aria-hidden="true""></span>
+        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right" aria-hidden="true"></span>
         <span class="wc-Navbar-link-label">Log in</span>
       </a>
       {% else %}
       <a class="wc-Navbar-link js-login-link" href="{{ url_for('logout') }}">
-        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right aria-hidden="true""></span>
+        <span class="wc-Navbar-link-icon wc-Icon wc-Icon--arrow-circle-right" aria-hidden="true"></span>
         <span class="wc-Navbar-link-label">Logout</span>
       </a>
       {% if session.user_id and session.avatar_url %}