diff --git a/sec_certs_page/static/base.css b/sec_certs_page/static/base.css
index 50a2a7819..fc238257f 100644
--- a/sec_certs_page/static/base.css
+++ b/sec_certs_page/static/base.css
@@ -2,6 +2,22 @@
     --sidebar-width: 250px;
 }
 
+/* Skip to main content link - accessible but visually hidden until focused */
+.skip-link {
+    position: absolute;
+    top: -40px;
+    left: 0;
+    background: #000;
+    color: white;
+    padding: 8px;
+    text-decoration: none;
+    z-index: 100;
+}
+
+.skip-link:focus {
+    top: 0;
+}
+
 .nav-button {
     margin-right: 0.5rem !important;
     margin-left: 0.5rem !important;
@@ -94,7 +110,7 @@
 .chat-message-user {
     text-align: right;
     background: #d1e7dd;
-    color: #0f5132;
+    color: #003d1a;
     border-radius: 1em 1em 0 1em;
     margin: 0.5em 0 0.5em auto;
     max-width: 75%;
@@ -104,7 +120,7 @@
 .chat-message-assistant {
     text-align: left;
     background: #d1dce7;
-    color: #0f3051;
+    color: #001529;
     border-radius: 1em 1em 1em 0;
     margin: 0.5em auto 0.5em 0;
     max-width: 75%;
@@ -361,7 +377,6 @@ h6 {
 .dropdown .dropbtn {
     font-size: 16px;
     border: none;
-    outline: none;
     color: white;
     padding: 14px 16px;
     background-color: inherit;
@@ -369,6 +384,11 @@ h6 {
     margin: 0; /* Important for vertical align on mobile phones */
 }
 
+.dropdown .dropbtn:focus-visible {
+    outline: 3px solid #ffc107;
+    outline-offset: 2px;
+}
+
 #left-navigation {
     position: fixed;
     left: 0px;
@@ -1027,3 +1047,149 @@ h6 {
     color: white;
 }
 
+/* ==========================================================================
+    WCAG Accessibility implementation   
+    btn-outline-primary color overrides per theme
+   ========================================================================== */
+
+[data-bs-theme="light"] .btn-outline-primary {
+    --bs-btn-color: #0060F0;
+    --bs-btn-border-color: #0060F0;
+    --bs-btn-hover-bg: #0060F0;
+    --bs-btn-hover-border-color: #0060F0;
+    --bs-btn-active-bg: #0060F0;
+    --bs-btn-active-border-color: #0060F0;
+}
+
+[data-bs-theme="light"] .btn-link {
+    --bs-btn-color: #0060F0;
+    --bs-btn-hover-color: #0056B3;
+    --bs-btn-active-color: #0056B3;
+}
+
+[data-bs-theme="dark"] .btn-outline-primary {
+    --bs-btn-color: #85B6FF;
+    --bs-btn-border-color: #85B6FF;
+    --bs-btn-hover-bg: #85B6FF;
+    --bs-btn-hover-border-color: #85B6FF;
+    --bs-btn-active-bg: #85B6FF;
+    --bs-btn-active-border-color: #85B6FF;
+}
+
+/* btn-outline-secondary:*/
+[data-bs-theme="dark"] .btn-outline-secondary {
+    --bs-btn-color: #AAAAAA;
+    --bs-btn-border-color: #AAAAAA;
+    --bs-btn-hover-color: #212529;
+    --bs-btn-hover-bg: #AAAAAA;
+    --bs-btn-hover-border-color: #AAAAAA;
+    --bs-btn-active-color: #212529;
+    --bs-btn-active-bg: #AAAAAA;
+    --bs-btn-active-border-color: #AAAAAA;
+}
+
+/* Higher contrast for links (Light mode) */
+[data-bs-theme="light"] p a {
+    color: #1A6BCC;
+}
+
+[data-bs-theme="light"] p a:hover,
+[data-bs-theme="light"] p a:focus {
+    color: #0056B3;
+}
+
+/* back to original color in dark mode*/
+[data-bs-theme="dark"] p a {
+    color: #85B6FF;
+}
+
+/* Higher contrast links on .bg-darker-light background*/
+[data-bs-theme="dark"] .bg-darker-light a:not(.btn) {
+    color: #9EC5FE;
+}
+[data-bs-theme="dark"] .bg-darker-light .btn-link {
+    --bs-btn-color: #9EC5FE;
+    --bs-btn-hover-color: #cfe2ff;
+    --bs-btn-active-color: #cfe2ff;
+}
+
+[data-bs-theme="light"] .bg-darker-light a:not(.btn) {
+    color: #1A6BCC;
+}
+[data-bs-theme="light"] .bg-darker-light .btn-link {
+    --bs-btn-color: #1A6BCC;
+    --bs-btn-hover-color: #0056B3;
+    --bs-btn-active-color: #0056B3;
+}
+
+/* ==========================================================================
+   Status label colors per theme
+   ========================================================================== */
+
+/* Light mode */
+[data-bs-theme="light"] .status-active {
+    color: #177D4D;
+}
+[data-bs-theme="light"] .status-archived{
+    color: #8B6313;
+}
+[data-bs-theme="light"] .status-historical {
+    color: #876608;
+}
+[data-bs-theme="light"] .status-revoked {
+    color: #dc3545;
+}
+
+/* Dark mode */
+[data-bs-theme="dark"] .status-active {
+    color: #57C78B;
+}
+[data-bs-theme="dark"] .status-archived,
+[data-bs-theme="dark"] .status-historical {
+    color: #ffcd39;
+}
+[data-bs-theme="dark"] .status-revoked {
+    color: #ea868f;
+}
+
+/* EUCC assurance levels */
+[data-bs-theme="light"] .eucc-assurance-high {
+    color: #177D4D;
+}
+[data-bs-theme="dark"] .eucc-assurance-high {
+    color: #57C78B;
+}
+[data-bs-theme="light"] .eucc-assurance-substantial {
+    color: #946300;
+}
+[data-bs-theme="dark"] .eucc-assurance-substantial {
+    color: #FFCA2C;
+}
+
+/* ==========================================================================
+   Alert link colors per theme
+   ========================================================================== */
+
+[data-bs-theme="light"] .alert-primary a,
+[data-bs-theme="light"] .alert-info a,
+[data-bs-theme="light"] .bg-darker-light .alert-primary a,
+[data-bs-theme="light"] .bg-darker-light .alert-info a {
+    color: #0158E4;
+}
+
+[data-bs-theme="light"] .alert-warning a {
+    color: #6B4800;
+}
+
+[data-bs-theme="dark"] .alert-info a,
+[data-bs-theme="dark"] .bg-darker-light .alert-info a {
+    color: #9EC5FE;
+}
+
+/*File metadata collapsible button — visible focus ring*/
+    
+.metadata-container > button:focus-visible {
+    outline: 3px solid var(--bs-focus-ring-color, #86b7fe);
+    outline-offset: 2px;
+    border-radius: 0.25rem;
+}
\ No newline at end of file
diff --git a/sec_certs_page/static/network.js b/sec_certs_page/static/network.js
index f09027c4e..bb56b4d54 100644
--- a/sec_certs_page/static/network.js
+++ b/sec_certs_page/static/network.js
@@ -176,7 +176,8 @@ class CertificateNetwork {
             .text("Status");
 
         const statusFilter = statusBox.append("select")
-            .attr("name", "status");
+            .attr("name", "status")
+            .attr("aria-label", "Filter by status");
 
         for (let status in this.statuses) {
             statusFilter.append("option")
diff --git a/sec_certs_page/templates/cc/entry/index.html.jinja2 b/sec_certs_page/templates/cc/entry/index.html.jinja2
index a725cc5ae..71a9206d9 100644
--- a/sec_certs_page/templates/cc/entry/index.html.jinja2
+++ b/sec_certs_page/templates/cc/entry/index.html.jinja2
@@ -356,7 +356,7 @@
                                 <tr>
                                     <th scope="col">Name</th>
                                     <th scope="col">Certificate ID</th>
-                                    <th scope="col"></th>
+                                    <th scope="col"><span class="visually-hidden">Actions</span></th>
                                 </tr>
                                 </thead>
                                 {% if previous %}
@@ -369,19 +369,19 @@
                                         <td>
                                             <a href="{{ url_for("cc.entry", hashid=other['_id']) }}">{{ other["name"] | truncate(120, true) }}</a>
                                             {% if other["name"] == cert["name"] and cert["name"] %}
-                                                <span class="badge rounded-pill bg-info text-dark"
-                                                      title="Certificate name matches exactly."
-                                                      data-bs-toggle="tooltip"><i
-                                                        class="fas fa-equals"></i></span>
+                                                <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                      aria-label="Certificate name matches exactly."
+                                                      data-bs-toggle="tooltip" title="Certificate name matches exactly."><i
+                                                        class="fas fa-equals" aria-hidden="true"></i></span>
                                             {% endif %}
                                         </td>
                                         <td>
                                             {{ other["heuristics"]["cert_id"] }}
                                             {% if other["heuristics"]["cert_id"] == cert["heuristics"]["cert_id"] and cert["heuristics"]["cert_id"] %}
-                                                <span class="badge rounded-pill bg-info text-dark"
-                                                      title="Certificate ID matches exactly."
-                                                      data-bs-toggle="tooltip"><i
-                                                        class="fas fa-equals"></i></span>
+                                                <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                      aria-label="Certificate ID matches exactly."
+                                                      data-bs-toggle="tooltip" title="Certificate ID matches exactly."><i
+                                                        class="fas fa-equals" aria-hidden="true"></i></span>
                                             {% endif %}
                                         </td>
                                         <td class="text-end">
@@ -399,19 +399,19 @@
                                         <td>
                                             <a href="{{ url_for("cc.entry", hashid=other['_id']) }}">{{ other["name"] | truncate(120, true) }}</a>
                                             {% if other["name"] == cert["name"] and cert["name"] %}
-                                                <span class="badge rounded-pill bg-info text-dark"
-                                                      title="Certificate name matches exactly."
-                                                      data-bs-toggle="tooltip"><i
-                                                        class="fas fa-equals"></i></span>
+                                                <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                      aria-label="Certificate name matches exactly."
+                                                      data-bs-toggle="tooltip" title="Certificate name matches exactly."><i
+                                                        class="fas fa-equals" aria-hidden="true"></i></span>
                                             {% endif %}
                                         </td>
                                         <td>
                                             {{ other["heuristics"]["cert_id"] }}
                                             {% if other["heuristics"]["cert_id"] == cert["heuristics"]["cert_id"] and cert["heuristics"]["cert_id"] %}
-                                                <span class="badge rounded-pill bg-info text-dark"
-                                                      title="Certificate ID matches exactly."
-                                                      data-bs-toggle="tooltip"><i
-                                                        class="fas fa-equals"></i></span>
+                                                <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                      aria-label="Certificate ID matches exactly."
+                                                      data-bs-toggle="tooltip" title="Certificate ID matches exactly."><i
+                                                        class="fas fa-equals" aria-hidden="true"></i></span>
                                             {% endif %}
                                         </td>
                                         <td class="text-end">
@@ -436,7 +436,7 @@
                                 <tr>
                                     <th scope="col">Name</th>
                                     <th scope="col">Certificate ID</th>
-                                    <th scope="col"></th>
+                                    <th scope="col"><span class="visually-hidden">Actions</span></th>
                                 </tr>
                                 </thead>
                                 {% for similar_cert in similar %}
@@ -446,39 +446,39 @@
                                             <a href="{{ url_for("cc.entry", hashid=similar_cert['_id']) }}"
                                                title="{{ similar_cert["name"] }}">{{ similar_cert["name"] | truncate(120, true) }}</a>
                                             {% if similar_cert["name"] == cert["name"] and cert["name"] %}
-                                                <span class="badge rounded-pill bg-info text-dark"
-                                                      title="Certificate name matches exactly."
-                                                      data-bs-toggle="tooltip"><i
-                                                        class="fas fa-equals"></i></span>
+                                                <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                      aria-label="Certificate name matches exactly."
+                                                      data-bs-toggle="tooltip" title="Certificate name matches exactly."><i
+                                                        class="fas fa-equals" aria-hidden="true"></i></span>
                                             {% endif %}
                                             {% if "state" in similar_cert %}
                                                 {% if "cert" in similar_cert["state"] and similar_cert["state"]["cert"]["source_hash"] == cert["state"]["cert"]["source_hash"] and cert["state"]["cert"]["source_hash"] %}
-                                                    <span class="badge rounded-pill bg-info text-dark"
-                                                          title="Certificate PDF file matches exactly."
-                                                          data-bs-toggle="tooltip"><i
-                                                            class="fas fa-file-alt"></i></span>
+                                                    <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                          aria-label="Certificate PDF file matches exactly."
+                                                          data-bs-toggle="tooltip" title="Certificate PDF file matches exactly."><i
+                                                            class="fas fa-file-alt" aria-hidden="true"></i></span>
                                                 {% endif %}
                                                 {% if "report" in similar_cert["state"] and similar_cert["state"]["report"]["source_hash"] == cert["state"]["report"]["source_hash"] and cert["state"]["report"]["source_hash"] %}
-                                                    <span class="badge rounded-pill bg-info text-dark"
-                                                          title="Certification report PDF file matches exactly."
-                                                          data-bs-toggle="tooltip"><i
-                                                            class="fas fa-file-alt"></i></span>
+                                                    <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                          aria-label="Certification report PDF file matches exactly."
+                                                          data-bs-toggle="tooltip" title="Certification report PDF file matches exactly."><i
+                                                            class="fas fa-file-alt" aria-hidden="true"></i></span>
                                                 {% endif %}
                                                 {% if "st" in similar_cert["state"] and similar_cert["state"]["st"]["source_hash"] == cert["state"]["st"]["source_hash"] and cert["state"]["st"]["source_hash"] %}
-                                                    <span class="badge rounded-pill bg-info text-dark"
-                                                          title="Security target PDF file matches exactly."
-                                                          data-bs-toggle="tooltip"><i
-                                                            class="fas fa-file-alt"></i></span>
+                                                    <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                          aria-label="Security target PDF file matches exactly."
+                                                          data-bs-toggle="tooltip" title="Security target PDF file matches exactly."><i
+                                                            class="fas fa-file-alt" aria-hidden="true"></i></span>
                                                 {% endif %}
                                             {% endif %}
                                         </td>
                                         <td>
                                             {{ similar_cert["heuristics"]["cert_id"] }}
                                             {% if similar_cert["heuristics"]["cert_id"] == cert["heuristics"]["cert_id"] and cert["heuristics"]["cert_id"] %}
-                                                <span class="badge rounded-pill bg-info text-dark"
-                                                      title="Certificate ID matches exactly."
-                                                      data-bs-toggle="tooltip"><i
-                                                        class="fas fa-equals"></i></span>
+                                                <span class="badge rounded-pill bg-info text-dark" role="img"
+                                                      aria-label="Certificate ID matches exactly."
+                                                      data-bs-toggle="tooltip" title="Certificate ID matches exactly."><i
+                                                        class="fas fa-equals" aria-hidden="true"></i></span>
                                             {% endif %}
                                         </td>
                                         <td class="text-end">
diff --git a/sec_certs_page/templates/cc/include.html.jinja2 b/sec_certs_page/templates/cc/include.html.jinja2
index 1d61cd702..027908ecf 100644
--- a/sec_certs_page/templates/cc/include.html.jinja2
+++ b/sec_certs_page/templates/cc/include.html.jinja2
@@ -12,9 +12,9 @@
 
 {% macro render_status(status) %}
     {% if status == "active" %}
-        <span class="text-success"><i class="fas fa-check-square"></i> active</span>
+        <span class="status-active"><i class="fas fa-check-square"></i> active</span>
     {% elif status == "archived" %}
-        <span class="text-warning"><i class="fas fa-times-circle"></i> archived</span>
+        <span class="status-archived"><i class="fas fa-times-circle"></i> archived</span>
     {% else %}
         <span>{{ status }}</span>
     {% endif %}
diff --git a/sec_certs_page/templates/cc/search/base.html.jinja2 b/sec_certs_page/templates/cc/search/base.html.jinja2
index b0f6ea544..88c7c5e64 100644
--- a/sec_certs_page/templates/cc/search/base.html.jinja2
+++ b/sec_certs_page/templates/cc/search/base.html.jinja2
@@ -7,11 +7,12 @@
                 <i class="fas fa-exclamation-triangle"></i> This page was not yet optimized for use on mobile devices.
             </div>
             <h1>Common Criteria</h1>
-            <h3 class="text-secondary">Search</h3>
+            <h2 class="text-secondary">Search</h2>
             <div class="card mt-3 mt-4 mb-4">
                 <div class="card-body container">
                     <div id="name" class="mt-1 mb-3">
                         <div class="form-inline">
+                            <label for="search" class="visually-hidden">Search prompt</label>
                             <input id="search" class="form-control mb-2" placeholder="Search prompt" type="search"
                                    value="{{ q|default('', true) }}"/>
 
@@ -51,7 +52,7 @@
                             </small><br/>
                             <small class="text-muted">
                                 E.g.
-                                <span class="font-monospace border rounded" onclick="window.getSelection().selectAllChildren(this)">Infineon Security Controller</span>
+                                <span class="font-monospace border rounded">Infineon Security Controller</span>
                                 .
                             </small>
                         </div>
@@ -60,18 +61,17 @@
                                 Supports the <a href="https://whoosh.readthedocs.io/en/latest/querylang.html"
                                         target="_blank" rel="noopener">Whoosh query language</a>.
                             </small><br/>
-                            <small class="text-muted">E.g. <span class="font-monospace border rounded"
-                                    onclick="window.getSelection().selectAllChildren(this)">"post quantum" OR "post-quantum" OR "PQC"</span>.
+                            <small class="text-muted">E.g. <span class="font-monospace border rounded">"post quantum" OR "post-quantum" OR "PQC"</span>.
                             </small>
                         </div>
                     </div>
                     <div id="extended" class="collapse {% if advanced %}show{% endif %} mt-3">
-                        <div id="categories" class="mb-3">
-                            <h4>Categories
+                        <div id="categories" class="mb-3" role="group" aria-labelledby="categories-heading" aria-describedby="categories-error">
+                            <h4 id="categories-heading">Categories
                                 <button id="cat-select-all" class="btn btn-outline-primary">Select all</button>
                                 <button id="cat-deselect-all" class="btn btn-outline-primary">Deselect all</button>
                             </h4>
-                            <div class="invalid-feedback" id="categories-error">
+                            <div class="invalid-feedback" id="categories-error" aria-live="polite" aria-atomic="true">
                             </div>
 
                             <div id="search-categories" class="row">
@@ -107,10 +107,10 @@
                                             <td>
                                                 <select id="search-status" class="d-inline form-select">
                                                     <option value="any" {% if status == "any" %}selected="selected"{% endif %}>Any</option>
-                                                    <option value="active" class="text-success"
+                                                    <option value="active" class="status-active"
                                                             {% if status == "active" %}selected="selected"{% endif %}>Active
                                                     </option>
-                                                    <option value="archived" class="text-warning"
+                                                    <option value="archived" class="status-archived"
                                                             {% if status == "archived" %}selected="selected"{% endif %}>Archived
                                                     </option>
                                                 </select>
diff --git a/sec_certs_page/templates/common/base.html.jinja2 b/sec_certs_page/templates/common/base.html.jinja2
index 1d59b4b25..748c47cbe 100644
--- a/sec_certs_page/templates/common/base.html.jinja2
+++ b/sec_certs_page/templates/common/base.html.jinja2
@@ -221,6 +221,7 @@
     {% endblock %}
 </head>
 <body data-bs-spy="scroll" data-bs-target="#navbar" data-bs-offset="57" class="position-relative">
+<a href="#content" class="skip-link">Skip to main content</a>
 <script>
     $(function () {
         let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
@@ -467,7 +468,7 @@
                                     </p>
                                 </div>
                                 <div class="flex-grow-1 flex-shrink-1 flex-basis-0">
-                                    <span class="fs-5 fw-bold d-inline-block mb-4">Quick links</span>
+                                    <h2 class="fs-5 fw-bold d-inline-block mb-4">Quick links</h2>
                                     <p><a href="{{ url_for("docs.serve_docs", path="index.html") }}"
                                           class="link-light link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover">
                                         Documentation
diff --git a/sec_certs_page/templates/eucc/entry/components/heuristics.html.jinja2 b/sec_certs_page/templates/eucc/entry/components/heuristics.html.jinja2
index 77fe0b5d7..3e7fe591f 100644
--- a/sec_certs_page/templates/eucc/entry/components/heuristics.html.jinja2
+++ b/sec_certs_page/templates/eucc/entry/components/heuristics.html.jinja2
@@ -44,7 +44,7 @@
                     <tr>
                         <th scope="col">Name</th>
                         <th scope="col">Certificate ID</th>
-                        <th scope="col"></th>
+                        <th scope="col"><span class="visually-hidden">Actions</span></th>
                     </tr>
                     </thead>
                     {% if previous %}
@@ -124,7 +124,7 @@
                     <tr>
                         <th scope="col">Name</th>
                         <th scope="col">Certificate ID</th>
-                        <th scope="col"></th>
+                        <th scope="col"><span class="visually-hidden">Actions</span></th>
                     </tr>
                     </thead>
                     {% for similar_cert in similar %}
diff --git a/sec_certs_page/templates/eucc/entry/components/webpage_info.html.jinja2 b/sec_certs_page/templates/eucc/entry/components/webpage_info.html.jinja2
index c73a6f507..5dfe8c02c 100644
--- a/sec_certs_page/templates/eucc/entry/components/webpage_info.html.jinja2
+++ b/sec_certs_page/templates/eucc/entry/components/webpage_info.html.jinja2
@@ -17,6 +17,8 @@
                     Certificate ID
                     <span class="text-muted ms-1 d-inline-flex align-items-center"
                           style="cursor: help;"
+                          role="img"
+                          tabindex="0"
                           data-bs-toggle="tooltip"
                           data-bs-html="true"
                           data-bs-placement="right"
diff --git a/sec_certs_page/templates/eucc/include.html.jinja2 b/sec_certs_page/templates/eucc/include.html.jinja2
index a90a5db43..59b65a4cc 100644
--- a/sec_certs_page/templates/eucc/include.html.jinja2
+++ b/sec_certs_page/templates/eucc/include.html.jinja2
@@ -38,9 +38,9 @@
 
 {% macro render_assurance_level(level) %}
     {% if level == "High" %}
-        <span class="text-success"><i class="fas fa-shield"></i> high</span>
+        <span class="eucc-assurance-high"><i class="fas fa-shield"></i> high</span>
     {% elif level == "Substantial" %}
-        <span class="text-warning"><i class="fas fa-shield"></i> substantial</span>
+        <span class="eucc-assurance-substantial"><i class="fas fa-shield"></i> substantial</span>
     {% else %}
         <span>{{ level }}</span>
     {% endif %}
diff --git a/sec_certs_page/templates/eucc/search/base.html.jinja2 b/sec_certs_page/templates/eucc/search/base.html.jinja2
index ceaba03f0..98ae2dc12 100644
--- a/sec_certs_page/templates/eucc/search/base.html.jinja2
+++ b/sec_certs_page/templates/eucc/search/base.html.jinja2
@@ -12,6 +12,7 @@
                 <div class="card-body container">
                     <div id="name" class="mt-1 mb-3">
                         <div class="form-inline">
+                            <label for="search" class="visually-hidden">Search EUCC certificates</label>
                             <input id="search" class="form-control mb-2" placeholder="Search prompt" type="search"
                                    value="{{ q|default('', true) }}"/>
 
diff --git a/sec_certs_page/templates/eucc/search/name_search.html.jinja2 b/sec_certs_page/templates/eucc/search/name_search.html.jinja2
index a2a08d4d8..8e9997ff4 100644
--- a/sec_certs_page/templates/eucc/search/name_search.html.jinja2
+++ b/sec_certs_page/templates/eucc/search/name_search.html.jinja2
@@ -33,6 +33,8 @@
                         <th class="pl-1">Certificate ID
                             <span class="text-muted ms-1 d-inline-flex align-items-center"
                                           style="cursor: help;"
+                                          role="img"
+                                          tabindex="0"
                                           data-bs-toggle="tooltip"
                                           data-bs-html="true"
                                           data-bs-placement="right"
diff --git a/sec_certs_page/templates/fips/entry/index.html.jinja2 b/sec_certs_page/templates/fips/entry/index.html.jinja2
index e40656378..7fdd1fd06 100644
--- a/sec_certs_page/templates/fips/entry/index.html.jinja2
+++ b/sec_certs_page/templates/fips/entry/index.html.jinja2
@@ -179,9 +179,9 @@
                             <tr>
                                 <th scope="row">Vendor</th>
                                 <td>
-                                    {{ cert["web_data"]["vendor"] }} <a
+                                    {{ cert["web_data"]["vendor"] }}{% if cert["web_data"]["vendor_www"] %} <a
                                         href="{{ cert["web_data"]['vendor_www'] }}" target="_blank"
-                                        rel="noopener">{{ cert["web_data"]["vendor_www"] }}</a>
+                                        rel="noopener">{{ cert["web_data"]["vendor_www"] }}</a>{% endif %}
                                 </td>
                             </tr>
                             {% if cert["web_data"]["lab"] %}
diff --git a/sec_certs_page/templates/fips/include.html.jinja2 b/sec_certs_page/templates/fips/include.html.jinja2
index aabdd27ed..781226e35 100644
--- a/sec_certs_page/templates/fips/include.html.jinja2
+++ b/sec_certs_page/templates/fips/include.html.jinja2
@@ -41,11 +41,11 @@
 
 {% macro render_status(status) %}
     {% if status|lower == "active" %}
-        <span class="text-success"><i class="fas fa-check-square"></i> active</span>
+        <span class="status-active"><i class="fas fa-check-square"></i> active</span>
     {% elif status|lower == "historical" %}
-        <span class="text-warning"><i class="fas fa-times-circle"></i> historical</span>
+        <span class="status-historical"><i class="fas fa-times-circle"></i> historical</span>
     {% elif status|lower == "revoked" %}
-        <span class="text-danger"><i class="fas fa-exclamation-triangle"></i> revoked</span>
+        <span class="status-revoked"><i class="fas fa-exclamation-triangle"></i> revoked</span>
     {% else %}
         <span>{{ status }}</span>
     {% endif %}
diff --git a/sec_certs_page/templates/fips/iut/iut_index.html.jinja2 b/sec_certs_page/templates/fips/iut/iut_index.html.jinja2
index 4ae4b4425..5f3837d16 100644
--- a/sec_certs_page/templates/fips/iut/iut_index.html.jinja2
+++ b/sec_certs_page/templates/fips/iut/iut_index.html.jinja2
@@ -28,7 +28,7 @@
                         <th title="Total number of entries on the IUT list">Total entries</th>
                         <th title="Displayed entries on the IUT list">Displayed entries</th>
                         <th title="Not displayed entries on the IUT list">Not displayed entries</th>
-                        <th></th>
+                        <th>Actions</th>
                     </tr>
                     </thead>
                     <tbody>
diff --git a/sec_certs_page/templates/fips/mip/mip_index.html.jinja2 b/sec_certs_page/templates/fips/mip/mip_index.html.jinja2
index a93871bed..dc4f5bb64 100644
--- a/sec_certs_page/templates/fips/mip/mip_index.html.jinja2
+++ b/sec_certs_page/templates/fips/mip/mip_index.html.jinja2
@@ -28,7 +28,7 @@
                         <th title="Total number of entries on the MIP list">Total entries</th>
                         <th title="Displayed entries on the MIP list">Displayed entries</th>
                         <th title="Not displayed entries on the MIP list">Not displayed entries</th>
-                        <th></th>
+                        <th>Actions</th>
                     </tr>
                     </thead>
                     <tbody>
diff --git a/sec_certs_page/templates/fips/search/base.html.jinja2 b/sec_certs_page/templates/fips/search/base.html.jinja2
index 6fc0be1f9..6d2d154c7 100644
--- a/sec_certs_page/templates/fips/search/base.html.jinja2
+++ b/sec_certs_page/templates/fips/search/base.html.jinja2
@@ -7,11 +7,12 @@
                 <i class="fas fa-exclamation-triangle"></i> This page was not yet optimized for use on mobile devices.
             </div>
             <h1>FIPS 140</h1>
-            <h3 class="text-secondary">Search</h3>
+            <h2 class="text-secondary">Search</h2>
             <div class="card mt-3 mt-4 mb-4">
                 <div class="card-body container">
                     <div id="name" class="mt-1 mb-3">
                         <div class="form-inline">
+                            <label for="search" class="visually-hidden">Search prompt</label>
                             <input id="search" class="form-control mb-2" placeholder="Search prompt" type="search"
                                    value="{{ q|default('', true) }}"/>
                             <div class="form-check form-check-inline">
@@ -102,13 +103,13 @@
                                             <td>
                                                 <select id="search-status" class="form-select">
                                                     <option value="Any" {% if status == "Any" %}selected="selected"{% endif %}>Any</option>
-                                                    <option value="Active" class="text-success"
+                                                    <option value="Active" class="status-active"
                                                             {% if status == "active" %}selected="selected"{% endif %}>Active
                                                     </option>
-                                                    <option value="Historical" class="text-warning"
+                                                    <option value="Historical" class="status-historical"
                                                             {% if status == "Historical" %}selected="selected"{% endif %}>Historical
                                                     </option>
-                                                    <option value="Revoked" class="text-danger"
+                                                    <option value="Revoked" class="status-revoked"
                                                             {% if status == "Revoked" %}selected="selected"{% endif %}>Revoked
                                                     </option>
                                                 </select>
diff --git a/sec_certs_page/templates/include/feedback.html.jinja2 b/sec_certs_page/templates/include/feedback.html.jinja2
index 6ad703b5f..482917852 100644
--- a/sec_certs_page/templates/include/feedback.html.jinja2
+++ b/sec_certs_page/templates/include/feedback.html.jinja2
@@ -1,12 +1,21 @@
 <script type="text/javascript">
     $(function () {
         $("#feedback-button").click(function () {
-            $("#feedback-card").toggleClass("collapsed");
+            var card = $("#feedback-card");
+            card.toggleClass("collapsed");
+            if (!card.hasClass("collapsed")) {
+                card.find("a, button").first().focus();
+            } else {
+                $("#feedback-button").focus();
+            }
         });
     })
 </script>
 
 <div id="feedback">
+    <button id="feedback-button" class="btn btn-secondary" type="button">
+        <span class="fas fa-fw fa-question-circle" aria-hidden="true"></span> Feedback
+    </button>
     <div id="feedback-card" class="card card-body collapsed">
         <h4>Feedback</h4>
         <p>Found a bug in the tool?</p>
@@ -22,7 +31,4 @@
             <span class="fas fa-fw fa-envelope color-white" aria-hidden="true"></span>
             Email us!</a>
     </div>
-    <div id="feedback-button" class="btn btn-secondary">
-        <span class="fas fa-fw fa-question-circle" aria-hidden="true"></span> Feedback
-    </div>
 </div>
diff --git a/sec_certs_page/templates/pp/search/base.html.jinja2 b/sec_certs_page/templates/pp/search/base.html.jinja2
index d2028fa0b..4d51d49f6 100644
--- a/sec_certs_page/templates/pp/search/base.html.jinja2
+++ b/sec_certs_page/templates/pp/search/base.html.jinja2
@@ -7,11 +7,12 @@
                 <i class="fas fa-exclamation-triangle"></i> This page was not yet optimized for use on mobile devices.
             </div>
             <h1>Protection Profiles</h1>
-            <h3 class="text-secondary">Search</h3>
+            <h2 class="text-secondary">Search</h2>
             <div class="card mt-3 mt-4 mb-4">
                 <div class="card-body container">
                     <div id="name" class="mt-1 mb-3">
                         <div class="form-inline">
+                            <label for="search" class="visually-hidden">Search prompt</label>
                             <input id="search" class="form-control mb-2" placeholder="Search prompt" type="search"
                                    value="{{ q|default('', true) }}"/>
                             <div class="form-check form-check-inline">
@@ -45,7 +46,7 @@
                             </small><br/>
                             <small class="text-muted">
                                 E.g. 
-                                <span class="font-monospace border rounded" onclick="window.getSelection().selectAllChildren(this)">Infineon Security Controller</span>
+                                <span class="font-monospace border rounded">Infineon Security Controller</span>
                                 .
                             </small>
                         </div>
@@ -55,17 +56,17 @@
                                         target="_blank" rel="noopener">Whoosh query language</a>.
                             </small><br/>
                             <small class="text-muted">E.g. <span class="font-monospace border rounded"
-                                    onclick="window.getSelection().selectAllChildren(this)">"post quantum" OR "post-quantum" OR "PQC"</span>.
+                                    >"post quantum" OR "post-quantum" OR "PQC"</span>.
                             </small>
                         </div>
                     </div>
                     <div id="extended" class="collapse {% if advanced %}show{% endif %} mt-3">
-                        <div id="categories" class="mb-3">
-                            <h4>Categories
+                        <div id="categories" class="mb-3" role="group" aria-labelledby="categories-heading" aria-describedby="categories-error">
+                            <h4 id="categories-heading">Categories
                                 <button id="cat-select-all" class="btn btn-outline-primary">Select all</button>
                                 <button id="cat-deselect-all" class="btn btn-outline-primary">Deselect all</button>
                             </h4>
-                            <div class="invalid-feedback" id="categories-error">
+                            <div class="invalid-feedback" id="categories-error" aria-live="polite" aria-atomic="true">
                             </div>
 
                             <div id="search-categories" class="row">
@@ -100,10 +101,10 @@
                                             <td>
                                                 <select id="search-status" class="form-select">
                                                     <option value="any" {% if status == "any" %}selected="selected"{% endif %}>Any</option>
-                                                    <option value="active" class="text-success"
+                                                    <option value="active" class="status-active"
                                                             {% if status == "active" %}selected="selected"{% endif %}>Active
                                                     </option>
-                                                    <option value="archived" class="text-warning"
+                                                    <option value="archived" class="status-archived"
                                                             {% if status == "archived" %}selected="selected"{% endif %}>Archived
                                                     </option>
                                                 </select>
diff --git a/sec_certs_page/templates/vuln/search.html.jinja2 b/sec_certs_page/templates/vuln/search.html.jinja2
index daf58e4b2..7924dd672 100644
--- a/sec_certs_page/templates/vuln/search.html.jinja2
+++ b/sec_certs_page/templates/vuln/search.html.jinja2
@@ -20,9 +20,10 @@
                                 <h4 class="card-title anchor" id="cve">CVEs</h4>
                                 <p class="card-text">Browse through CVEs and see which certificates they impact.</p>
                                 <div class="form-inline">
+                                    <label for="cve-input" class="visually-hidden">CVE ID</label>
                                     <input id="cve-input" class="form-control mb-2" placeholder="CVE ID" type="search"
                                            value=""/>
-                                    <small class="text-muted">E.g. <span class="font-monospace border rounded" onclick="window.getSelection().selectAllChildren(this)">CVE-2019-15809</span>.</small>
+                                    <small class="text-muted">E.g. <span class="font-monospace border rounded">CVE-2019-15809</span>.</small>
                                     <div class="invalid-feedback">
                                         CVE invalid.
                                     </div>
@@ -38,9 +39,10 @@
                                 <h4 class="card-title anchor" id="cpe">CPEs</h4>
                                 <p class="card-text">Browse through CPEs and see which certificates they match.</p>
                                 <div class="form-inline">
+                                    <label for="cpe-input" class="visually-hidden">CPE URI</label>
                                     <input id="cpe-input" class="form-control mb-2" placeholder="CPE URI" type="search"
                                            value=""/>
-                                    <small class="text-muted">E.g. <span class="font-monospace border rounded" onclick="window.getSelection().selectAllChildren(this)">cpe:2.3:a:microchip:atmel_toolbox:00.03.11.05:*:*:*:*:*:*:*</span>.</small>
+                                    <small class="text-muted">E.g. <span class="font-monospace border rounded">cpe:2.3:a:microchip:atmel_toolbox:00.03.11.05:*:*:*:*:*:*:*</span>.</small>
 
                                     <div class="invalid-feedback">
                                         CPE invalid.