diff --git a/static/ejs/partials/components/categorySelector.ejs b/static/ejs/partials/components/categorySelector.ejs
index 343451b7..2c9e3d86 100644
--- a/static/ejs/partials/components/categorySelector.ejs
+++ b/static/ejs/partials/components/categorySelector.ejs
@@ -5,53 +5,63 @@
   passed: "Passed"
 } %>
 
-<button
-  aria-labelledby="<%= category %>Title <%= category %>ItemsInformation"
-  aria-describedby="<%= category %>AriaDescription"
-  id="<%= category %>Selector"
-  class="h-100 category-selector <%= category %>"
-  onclick="changeSelectedCategory(event, '<%= category %>')"
-  onfocus="document.getElementById('<%= category %>Description').dispatchEvent(new MouseEvent('mouseover'))"
-  onblur="document.getElementById('<%= category %>Description').dispatchEvent(new MouseEvent('mouseout'))"
-  onmousedown="event.preventDefault()"
->
-  <div class="d-flex align-items-center mb-3">
-    <span id="<%= category %>Title" class="d-flex align-items-center category-name fw-bold d-inline mb-0">
-      <%= formattedCategoryTitles[category] %>
-    </span>
-    <svg
-      tabindex="-1"
-      id="<%= category %>Description"
-      class="ms-2"
-      data-bs-toggle="tooltip"
-      data-bs-placement="top"
-      title="<%= items[category].description %>"
-      width="14"
-      height="14"
-      viewBox="0 0 14 14"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <g clip-path="url(.clip0_1630_1670)">
-        <path
-          d="M11.9528 2.05329C9.22079 -0.68205 4.78867 -0.68477 2.0533 2.04718C-0.682042 4.7792 -0.684795 9.21135 2.04722 11.9467C4.77917 14.6821 9.21135 14.6848 11.9467 11.9528C14.682 9.22085 14.6848 4.78863 11.9528 2.05329ZM7.00216 11.2406C6.6319 11.2406 6.33174 10.9405 6.33174 10.5702C6.33174 10.1999 6.63187 9.89976 7.00216 9.89976C7.37243 9.89976 7.67259 10.1999 7.67259 10.5702C7.67255 10.9405 7.37243 11.2406 7.00216 11.2406ZM8.09214 7.20401C7.70918 7.42788 7.67645 7.7033 7.6748 8.49691C7.6747 8.54938 7.67453 8.60233 7.67423 8.65558C7.67185 9.03068 7.36712 9.33312 6.99253 9.33312C6.99105 9.33312 6.98957 9.33312 6.98813 9.33312C6.61159 9.33074 6.3083 9.02356 6.31066 8.64699C6.31099 8.59568 6.31109 8.54468 6.31119 8.49415C6.31287 7.67852 6.31492 6.66352 7.40395 6.02694C8.27777 5.51613 8.3879 5.18059 8.28543 4.74029C8.16503 4.2231 7.69273 4.08907 7.32418 4.1312C7.20042 4.14541 6.58322 4.24724 6.58322 4.85783C6.58322 5.23431 6.27795 5.5396 5.90141 5.5396C5.52487 5.5396 5.21964 5.23431 5.21964 4.85783C5.21964 3.76416 6.02107 2.90831 7.16859 2.77656C8.35043 2.64099 9.35515 3.32135 9.61338 4.4312C9.99939 6.08915 8.61379 6.89911 8.09214 7.20401Z"
-          fill="#B5C5CA"
-        />
-      </g>
-      <defs>
-        <clipPath class="clip0_1630_1670">
-          <rect width="14" height="14" fill="white" />
-        </clipPath>
-      </defs>
-    </svg>
-  </div>
-  <span id="<%= category %>ItemsInformation" class="category-information">
-    <% if (category !== 'passed' && items[category].totalItems !== 0) { %> 
-      <%= items[category].rules.length %> issues / <%= items[category].totalItems %> occurrences
-    <% } else if (category !== 'passed' && items[category].totalItems === 0) { %>
-      0 issues
-    <% } else { %>
-      <%= items[category].totalItems %> occurrences
+<nav class="d-none d-md-flex row m-0 pt-3 px-2" aria-label="Issue category">
+  <% Object.keys(items).forEach((category) => { %>
+    <% if (category !== 'passed') { %>
+      <div class="col-md-4 px-2">
+        <button
+          aria-labelledby="<%= category %>Title <%= category %>ItemsInformation"
+          aria-describedby="<%= category %>AriaDescription"
+          id="<%= category %>Selector"
+          class="h-100 category-selector <%= category %>"
+          onclick="changeSelectedCategory(event, '<%= category %>')"
+          onfocus="document.getElementById('<%= category %>Description').dispatchEvent(new MouseEvent('mouseover'))"
+          onblur="document.getElementById('<%= category %>Description').dispatchEvent(new MouseEvent('mouseout'))"
+          onmousedown="event.preventDefault()"
+        >
+          <div class="d-flex align-items-center mb-3">
+            <span id="<%= category %>Title" class="d-flex align-items-center category-name fw-bold d-inline mb-0">
+              <%= formattedCategoryTitles[category] %>
+            </span>
+            <svg
+              tabindex="-1"
+              id="<%= category %>Description"
+              class="ms-2"
+              data-bs-toggle="tooltip"
+              data-bs-placement="top"
+              title="<%= items[category].description %>"
+              width="14"
+              height="14"
+              viewBox="0 0 14 14"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <g clip-path="url(.clip0_1630_1670)">
+                <path
+                  d="M11.9528 2.05329C9.22079 -0.68205 4.78867 -0.68477 2.0533 2.04718C-0.682042 4.7792 -0.684795 9.21135 2.04722 11.9467C4.77917 14.6821 9.21135 14.6848 11.9467 11.9528C14.682 9.22085 14.6848 4.78863 11.9528 2.05329ZM7.00216 11.2406C6.6319 11.2406 6.33174 10.9405 6.33174 10.5702C6.33174 10.1999 6.63187 9.89976 7.00216 9.89976C7.37243 9.89976 7.67259 10.1999 7.67259 10.5702C7.67255 10.9405 7.37243 11.2406 7.00216 11.2406ZM8.09214 7.20401C7.70918 7.42788 7.67645 7.7033 7.6748 8.49691C7.6747 8.54938 7.67453 8.60233 7.67423 8.65558C7.67185 9.03068 7.36712 9.33312 6.99253 9.33312C6.99105 9.33312 6.98957 9.33312 6.98813 9.33312C6.61159 9.33074 6.3083 9.02356 6.31066 8.64699C6.31099 8.59568 6.31109 8.54468 6.31119 8.49415C6.31287 7.67852 6.31492 6.66352 7.40395 6.02694C8.27777 5.51613 8.3879 5.18059 8.28543 4.74029C8.16503 4.2231 7.69273 4.08907 7.32418 4.1312C7.20042 4.14541 6.58322 4.24724 6.58322 4.85783C6.58322 5.23431 6.27795 5.5396 5.90141 5.5396C5.52487 5.5396 5.21964 5.23431 5.21964 4.85783C5.21964 3.76416 6.02107 2.90831 7.16859 2.77656C8.35043 2.64099 9.35515 3.32135 9.61338 4.4312C9.99939 6.08915 8.61379 6.89911 8.09214 7.20401Z"
+                  fill="#B5C5CA"
+                />
+              </g>
+              <defs>
+                <clipPath class="clip0_1630_1670">
+                  <rect width="14" height="14" fill="white" />
+                </clipPath>
+              </defs>
+            </svg>
+          </div>
+          <span id="<%= category %>ItemsInformation" class="category-information">
+            <% if (category !== 'passed' && items[category].totalItems !== 0) { %> 
+              <%= items[category].rules.length %> issues / <%= items[category].totalItems %> occurrences
+            <% } else if (category !== 'passed' && items[category].totalItems === 0) { %>
+              0 issues
+            <% } else { %>
+              <%= items[category].totalItems %> occurrences
+            <% } %>
+          </span>
+        </button>
+      </div>
     <% } %>
-  </span>
-</button>
+  <% }) %>
+</nav>
+
+
diff --git a/static/ejs/partials/components/categorySelectorDropdown.ejs b/static/ejs/partials/components/categorySelectorDropdown.ejs
index 69f46858..b32df4c6 100644
--- a/static/ejs/partials/components/categorySelectorDropdown.ejs
+++ b/static/ejs/partials/components/categorySelectorDropdown.ejs
@@ -5,22 +5,70 @@
   passed: "Passed"
 } %>
 
-<li
-aria-labelledby="<%= category %>Title <%= category %>ItemsInformation"
-aria-describedby="<%= category %>AriaDescription"
-id="<%= category %>DropdownSelector"
-class="<%= category %>"
-role="option"
->    <span id="<%= category %>Title" class="align-items-center category-name fw-bold d-inline mb-0">
-  <%= formattedCategoryTitles[category] %>
-</span>
-<span id="<%= category %>ItemsInformation" class="px-2 category-information">
-  <% if (category !== 'passed' && items[category].totalItems !== 0) { %> 
-    (<%= items[category].rules.length %> issues) 
-  <% } else if (category !== 'passed' && items[category].totalItems === 0) { %>
-    0 issues
-  <% } else { %>
-    (<%= items[category].totalItems %> occurrences)
-  <% } %>
-</span>
-</li>
+<div class="d-md-none d-flex mt-4 mx-2 px-2 position-relative ally-button-container" aria-label="Issue category">
+  <label class="visually-hidden" for="select">Accessible Dropdown</label>
+  <button
+    class="ally-toggle-button"
+    role="combobox"
+    id="select"
+    value="Select"
+    aria-controls="listbox"
+    aria-haspopup="listbox"
+    tabindex="0"
+    aria-expanded="false"
+  >Accessible Dropdown</button>
+  <div>
+    <svg
+      tabindex="-1"
+      id="categorySelectorDropdownToolipDescription"
+      class="h-100 ms-2"
+      data-bs-toggle="tooltip"
+      data-bs-placement="top"
+      title="Choose a category from the dropdown"
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+    <g clip-path="url(.clip0_1630_1670)">
+      <path
+        d="M11.9528 2.05329C9.22079 -0.68205 4.78867 -0.68477 2.0533 2.04718C-0.682042 4.7792 -0.684795 9.21135 2.04722 11.9467C4.77917 14.6821 9.21135 14.6848 11.9467 11.9528C14.682 9.22085 14.6848 4.78863 11.9528 2.05329ZM7.00216 11.2406C6.6319 11.2406 6.33174 10.9405 6.33174 10.5702C6.33174 10.1999 6.63187 9.89976 7.00216 9.89976C7.37243 9.89976 7.67259 10.1999 7.67259 10.5702C7.67255 10.9405 7.37243 11.2406 7.00216 11.2406ZM8.09214 7.20401C7.70918 7.42788 7.67645 7.7033 7.6748 8.49691C7.6747 8.54938 7.67453 8.60233 7.67423 8.65558C7.67185 9.03068 7.36712 9.33312 6.99253 9.33312C6.99105 9.33312 6.98957 9.33312 6.98813 9.33312C6.61159 9.33074 6.3083 9.02356 6.31066 8.64699C6.31099 8.59568 6.31109 8.54468 6.31119 8.49415C6.31287 7.67852 6.31492 6.66352 7.40395 6.02694C8.27777 5.51613 8.3879 5.18059 8.28543 4.74029C8.16503 4.2231 7.69273 4.08907 7.32418 4.1312C7.20042 4.14541 6.58322 4.24724 6.58322 4.85783C6.58322 5.23431 6.27795 5.5396 5.90141 5.5396C5.52487 5.5396 5.21964 5.23431 5.21964 4.85783C5.21964 3.76416 6.02107 2.90831 7.16859 2.77656C8.35043 2.64099 9.35515 3.32135 9.61338 4.4312C9.99939 6.08915 8.61379 6.89911 8.09214 7.20401Z"
+        fill="#B5C5CA"
+      />
+    </g>
+    <defs>
+      <clipPath class="clip0_1630_1670">
+        <rect width="14" height="14" fill="white" />
+      </clipPath>
+    </defs>
+  </svg>
+  </div>
+  <!-- Screen Reader Announcer -->
+  <div class="visually-hidden" id="announcement" aria-live="assertive" role="alert"></div>
+  <ul role="listbox" id="listbox">
+    <% Object.keys(items).forEach((category) => { %>
+      <% if (category !== 'passed') { %>
+        <li
+          aria-labelledby="<%= category %>Title <%= category %>ItemsInformation"
+          aria-describedby="<%= category %>AriaDescription"
+          id="<%= category %>DropdownSelector"
+          class="<%= category %>"
+          role="option"
+          >    <span id="<%= category %>Title" class="align-items-center category-name fw-bold d-inline mb-0">
+            <%= formattedCategoryTitles[category] %>
+          </span>
+          <span id="<%= category %>ItemsInformation" class="px-2 category-information">
+            <% if (category !== 'passed' && items[category].totalItems !== 0) { %> 
+              (<%= items[category].rules.length %> issues) 
+            <% } else if (category !== 'passed' && items[category].totalItems === 0) { %>
+              (0 issues)
+            <% } else { %>
+              (<%= items[category].totalItems %> occurrences)
+            <% } %>
+          </span>
+        </li>
+      <% } %>
+    <% }) %>
+  </ul>
+</div>
diff --git a/static/ejs/partials/components/scanAbout.ejs b/static/ejs/partials/components/scanAbout.ejs
index 8f7a15a7..d03fa9f4 100644
--- a/static/ejs/partials/components/scanAbout.ejs
+++ b/static/ejs/partials/components/scanAbout.ejs
@@ -150,6 +150,82 @@
       <% } %>
       </button>
     </li>
+    <li>
+      <svg
+        aria-label="Scan Statistics"
+        width="17"
+        height="18"
+        viewBox="0 0 17 18"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <g clip-path="url(#clip0_1630_1547)">
+          <path
+            d="M14.0299 1.09229H2.97102C2.59546 1.09229 2.29102 1.39673 2.29102 1.77228V16.231C2.29102 16.6065 2.59546 16.911 2.97102 16.911H14.0299C14.4054 16.911 14.7099 16.6065 14.7099 16.231V1.77228C14.7099 1.39673 14.4054 1.09229 14.0299 1.09229Z"
+            stroke="#CED4DA"
+            stroke-width="1.7369"
+          />
+          <path
+            d="M5.03369 4.92139H11.9663"
+            stroke="#CED4DA"
+            stroke-width="1.189"
+            stroke-linecap="round"
+          />
+          <path
+            d="M5.03369 7.64136H11.9663"
+            stroke="#CED4DA"
+            stroke-width="1.189"
+            stroke-linecap="round"
+          />
+          <path
+            d="M5.03369 10.3613H11.9663"
+            stroke="#CED4DA"
+            stroke-width="1.189"
+            stroke-linecap="round"
+          />
+          <path
+            d="M5.03369 13.0813H11.9663"
+            stroke="#CED4DA"
+            stroke-width="1.189"
+            stroke-linecap="round"
+          />
+        </g>
+        <defs>
+          <clipPath id="clip0_1630_1547">
+            <rect width="17" height="17" fill="white" transform="translate(0 0.501465)" />
+          </clipPath>
+        </defs>
+      </svg>
+      <span>
+        <%= items.mustFix.totalItems + items.goodToFix.totalItems  %> occurrences failed,<br>
+        <%= items.passed.totalItems %> occurences passed
+        <svg
+          tabindex="-1"
+          id="passedItemsTooltip"
+          class="ms-2"
+          data-bs-toggle="tooltip"
+          data-bs-placement="top"
+          title="You may find the list of passed HTML elements in ./passed_items.json.txt"
+          width="14"
+          height="14"
+          viewBox="0 0 14 14"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <g clip-path="url(.clip0_1630_1670)">
+            <path
+              d="M11.9528 2.05329C9.22079 -0.68205 4.78867 -0.68477 2.0533 2.04718C-0.682042 4.7792 -0.684795 9.21135 2.04722 11.9467C4.77917 14.6821 9.21135 14.6848 11.9467 11.9528C14.682 9.22085 14.6848 4.78863 11.9528 2.05329ZM7.00216 11.2406C6.6319 11.2406 6.33174 10.9405 6.33174 10.5702C6.33174 10.1999 6.63187 9.89976 7.00216 9.89976C7.37243 9.89976 7.67259 10.1999 7.67259 10.5702C7.67255 10.9405 7.37243 11.2406 7.00216 11.2406ZM8.09214 7.20401C7.70918 7.42788 7.67645 7.7033 7.6748 8.49691C7.6747 8.54938 7.67453 8.60233 7.67423 8.65558C7.67185 9.03068 7.36712 9.33312 6.99253 9.33312C6.99105 9.33312 6.98957 9.33312 6.98813 9.33312C6.61159 9.33074 6.3083 9.02356 6.31066 8.64699C6.31099 8.59568 6.31109 8.54468 6.31119 8.49415C6.31287 7.67852 6.31492 6.66352 7.40395 6.02694C8.27777 5.51613 8.3879 5.18059 8.28543 4.74029C8.16503 4.2231 7.69273 4.08907 7.32418 4.1312C7.20042 4.14541 6.58322 4.24724 6.58322 4.85783C6.58322 5.23431 6.27795 5.5396 5.90141 5.5396C5.52487 5.5396 5.21964 5.23431 5.21964 4.85783C5.21964 3.76416 6.02107 2.90831 7.16859 2.77656C8.35043 2.64099 9.35515 3.32135 9.61338 4.4312C9.99939 6.08915 8.61379 6.89911 8.09214 7.20401Z"
+              fill="#B5C5CA"
+            />
+          </g>
+          <defs>
+            <clipPath class="clip0_1630_1670">
+              <rect width="14" height="14" fill="white" />
+            </clipPath>
+          </defs>
+        </svg>
+      </span>
+    </li>
     <li>
       <svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000" fill="none">
         <mask id="mask0_459_43" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="1001" height="1001">
diff --git a/static/ejs/partials/main.ejs b/static/ejs/partials/main.ejs
index ed2ba0cf..d9a2847f 100644
--- a/static/ejs/partials/main.ejs
+++ b/static/ejs/partials/main.ejs
@@ -16,65 +16,11 @@
         <div id= "searchGroup" class="row m-0 px-3">
           <%- include("components/reportSearch") %>
         </div>
-      <!-- Button Category Selector -->
-      <nav class="d-none d-md-flex row m-0 pt-3 px-2" aria-label="Issue category">
-        <% Object.keys(items).forEach((category) => { %>
-        <div class="col-md-4 px-2">
-          <%- include("components/categorySelector", { category: category }) %>
-        </div>
-        <% }) %>
-      </nav>
+        <!-- Button Category Selector -->
+        <%- include("components/categorySelector") %>
+
       <!-- Dropdown Category Selector -->
-      <div class="d-md-none d-flex mt-4 mx-2 px-2 position-relative ally-button-container" aria-label="Issue category">
-        <label class="visually-hidden" for="select">Accessible Dropdown</label>
-        <button
-          class="ally-toggle-button"
-          role="combobox"
-          id="select"
-          value="Select"
-          aria-controls="listbox"
-          aria-haspopup="listbox"
-          tabindex="0"
-          aria-expanded="false"
-        >Accessible Dropdown</button>
-        <div>
-          <!-- [TESTCODE] SVG placeholder-->
-          <!-- FIX: This needs to be dynamic, the id description has to match the selected category -->
-          <svg
-          tabindex="-1"
-          id="passedDescription"
-          class="h-100 ms-2"
-          data-bs-toggle="tooltip"
-          data-bs-placement="top"
-          title="Occurrences that passed the automated checks."
-          width="14"
-          height="14"
-          viewBox="0 0 14 14"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <g clip-path="url(.clip0_1630_1670)">
-            <path
-              d="M11.9528 2.05329C9.22079 -0.68205 4.78867 -0.68477 2.0533 2.04718C-0.682042 4.7792 -0.684795 9.21135 2.04722 11.9467C4.77917 14.6821 9.21135 14.6848 11.9467 11.9528C14.682 9.22085 14.6848 4.78863 11.9528 2.05329ZM7.00216 11.2406C6.6319 11.2406 6.33174 10.9405 6.33174 10.5702C6.33174 10.1999 6.63187 9.89976 7.00216 9.89976C7.37243 9.89976 7.67259 10.1999 7.67259 10.5702C7.67255 10.9405 7.37243 11.2406 7.00216 11.2406ZM8.09214 7.20401C7.70918 7.42788 7.67645 7.7033 7.6748 8.49691C7.6747 8.54938 7.67453 8.60233 7.67423 8.65558C7.67185 9.03068 7.36712 9.33312 6.99253 9.33312C6.99105 9.33312 6.98957 9.33312 6.98813 9.33312C6.61159 9.33074 6.3083 9.02356 6.31066 8.64699C6.31099 8.59568 6.31109 8.54468 6.31119 8.49415C6.31287 7.67852 6.31492 6.66352 7.40395 6.02694C8.27777 5.51613 8.3879 5.18059 8.28543 4.74029C8.16503 4.2231 7.69273 4.08907 7.32418 4.1312C7.20042 4.14541 6.58322 4.24724 6.58322 4.85783C6.58322 5.23431 6.27795 5.5396 5.90141 5.5396C5.52487 5.5396 5.21964 5.23431 5.21964 4.85783C5.21964 3.76416 6.02107 2.90831 7.16859 2.77656C8.35043 2.64099 9.35515 3.32135 9.61338 4.4312C9.99939 6.08915 8.61379 6.89911 8.09214 7.20401Z"
-              fill="#B5C5CA"
-            />
-          </g>
-          <defs>
-            <clipPath class="clip0_1630_1670">
-              <rect width="14" height="14" fill="white" />
-            </clipPath>
-          </defs>
-        </svg>
-        </div>
-        <!-- Screen Reader Announcer -->
-        <div class="visually-hidden" id="announcement" aria-live="assertive" role="alert"></div>
-        <ul role="listbox" id="listbox">
-          <!-- categorySelectorDropdown.ejs is rendered here -->
-          <% Object.keys(items).forEach((category) => { %>
-              <%- include("components/categorySelectorDropdown", { category: category }) %>
-            <% }) %>
-        </ul>
-      </div>
+      <%- include("components/categorySelectorDropdown") %>
       <ul id="categorySummary" class="unbulleted-list px-3 py-4 mb-3 flex-grow-1">
         <!-- dynamically generated section from scripts/categorySummary -->
         <%# dynamically generated section from scripts/categorySummary %>
@@ -84,15 +30,13 @@
         Tooltip: Contains AI suggestions.
       </p>
       <p id="mustFixAriaDescription" class="d-none">
-        Tooltip: Issues that need to be addressed promptly, as they create significant barriers for
-        persons with disabilities and can prevent them from accessing essential content or features.
+        Tooltip: <%= items.mustFix.description %>
       </p>
       <p id="goodToFixAriaDescription" class="d-none">
-        Tooltip: Issues that could pose certain challenges for persons with disabilities (PWDs), but
-        are unlikely to completely hinder their access to essential content or features.
+        Tooltip: <%= items.goodToFix.description %>
       </p>
       <p id="passedAriaDescription" class="d-none">
-        Tooltip: Occurrences that passed the automated checks.
+        Tooltip: <%= items.passed.description %>
       </p>
     </section>
   </main>
diff --git a/static/ejs/partials/scripts/categorySelectorDropdownScript.ejs b/static/ejs/partials/scripts/categorySelectorDropdownScript.ejs
index 6b86183a..aff6e35b 100644
--- a/static/ejs/partials/scripts/categorySelectorDropdownScript.ejs
+++ b/static/ejs/partials/scripts/categorySelectorDropdownScript.ejs
@@ -132,10 +132,16 @@ accessibility %>
     toggleAllyDropdown();
     announceOption(optionValue);
 
-    // FIX: Implement functionality with search function
-
-    // Ensures <category>Selector on desktop view matches
+    // Get categorySelector selected category
     const sharedCategory = optionElement.classList[0];
+
+    // Update tooltip
+    const svgElement = document.getElementById('categorySelectorDropdownToolipDescription');
+    svgElement.setAttribute('title', scanItems[sharedCategory].description);
+    const tooltip = new bootstrap.Tooltip(svgElement);
+    tooltip.update();
+
+    // Ensures categorySelector on desktop view matches with dropdown and load rules summary again
     const matchingButtonId = sharedCategory + 'Selector';
     document.getElementById(matchingButtonId).click();
     loadRulesSummary(sharedCategory, searchInput);
diff --git a/static/ejs/partials/scripts/reportSearch.ejs b/static/ejs/partials/scripts/reportSearch.ejs
index 30f2a981..e88c36a4 100644
--- a/static/ejs/partials/scripts/reportSearch.ejs
+++ b/static/ejs/partials/scripts/reportSearch.ejs
@@ -186,7 +186,7 @@
     } else {
       updatedIssueOccurence = `<strong style="color: #0047FA;">${filteredItems[category].totalItems}</strong> occurrences`;
     }
-    document.getElementById(`${category}ItemsInformation`).innerHTML = updatedIssueOccurence;
+    if (category !== 'passed') document.getElementById(`${category}ItemsInformation`).innerHTML = updatedIssueOccurence;
   }
 
   function resetIssueOccurence(category, filteredItems) {
@@ -199,7 +199,7 @@
       } else {
         updatedIssueOccurence = `${filteredItems[category].totalItems} occurrences`;
       }
-      document.getElementById(`${category}ItemsInformation`).innerHTML = updatedIssueOccurence;
+      if (category !== 'passed') document.getElementById(`${category}ItemsInformation`).innerHTML = updatedIssueOccurence;
     }
   }
 
diff --git a/static/ejs/partials/scripts/ruleOffcanvas.ejs b/static/ejs/partials/scripts/ruleOffcanvas.ejs
index 5c7e9c65..0f7c2b9c 100644
--- a/static/ejs/partials/scripts/ruleOffcanvas.ejs
+++ b/static/ejs/partials/scripts/ruleOffcanvas.ejs
@@ -115,7 +115,7 @@ category summary is clicked %>
     Object.keys(filteredItems).forEach(category => {
       const ruleInCategory = filteredItems[category].rules.find(r => r.rule === selectedRule.rule);
     // END search feat changes
-      if (ruleInCategory !== undefined) {
+      if (ruleInCategory !== undefined && category !== 'passed') {
         if (category !== 'passed') {
           availableFixCategories.push(category);
         }
diff --git a/static/ejs/partials/styles/styles.ejs b/static/ejs/partials/styles/styles.ejs
index 81bd4443..6b96598d 100644
--- a/static/ejs/partials/styles/styles.ejs
+++ b/static/ejs/partials/styles/styles.ejs
@@ -94,10 +94,10 @@
 
     --good-to-fix-icon: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17.1429 0H2.85714C1.27919 0 0 1.27919 0 2.85714V17.1429C0 18.7208 1.27919 20 2.85714 20H17.1429C18.7208 20 20 18.7208 20 17.1429V2.85714C20 1.27919 18.7208 0 17.1429 0Z' fill='%23F79009'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M10 6.5625C8.10131 6.5625 6.5625 8.10131 6.5625 10C6.5625 11.8987 8.10131 13.4375 10 13.4375C11.8987 13.4375 13.4375 11.8987 13.4375 10C13.4375 8.10131 11.8987 6.5625 10 6.5625ZM4.84375 10C4.84375 7.15207 7.15207 4.84375 10 4.84375C12.8479 4.84375 15.1562 7.15207 15.1562 10C15.1562 12.8479 12.8479 15.1562 10 15.1562C7.15207 15.1562 4.84375 12.8479 4.84375 10Z' fill='white'/%3E%3C/svg%3E%0A");
 
-    --passed-icon: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17.1429 0H2.85714C1.27919 0 0 1.27919 0 2.85714V17.1429C0 18.7208 1.27919 20 2.85714 20H17.1429C18.7208 20 20 18.7208 20 17.1429V2.85714C20 1.27919 18.7208 0 17.1429 0Z' fill='%23039855'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15.1781 5.3131C15.7942 5.80597 15.8941 6.70496 15.4012 7.32105L9.68694 14.4639C9.19407 15.08 8.29508 15.1799 7.67899 14.687C7.0629 14.1941 6.96301 13.2951 7.45589 12.6791L13.1702 5.5362C13.663 4.92011 14.562 4.82023 15.1781 5.3131Z' fill='white'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M4.70415 9.70455C5.26204 9.14666 6.16656 9.14666 6.72446 9.70455L9.5816 12.5617C10.1395 13.1196 10.1395 14.0241 9.5816 14.582C9.02371 15.1399 8.11919 15.1399 7.56129 14.582L4.70415 11.7249C4.14626 11.167 4.14626 10.2624 4.70415 9.70455Z' fill='white'/%3E%3C/svg%3E%0A");
-    
     --needs-review-icon: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17.1429 0H2.85714C1.27919 0 0 1.27919 0 2.85714V17.1429C0 18.7208 1.27919 20 2.85714 20H17.1429C18.7208 20 20 18.7208 20 17.1429V2.85714C20 1.27919 18.7208 0 17.1429 0Z' fill='%236A8A95'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M8.09759 7.26594C8.23445 6.67496 8.46462 6.23328 8.7881 5.9409C9.14891 5.65474 9.57815 5.51166 10.0758 5.51166C10.5984 5.51166 11.0152 5.64852 11.3262 5.92224C11.6372 6.19596 11.7928 6.53188 11.7928 6.93002C11.7928 7.22862 11.7057 7.48367 11.5315 7.69518C11.4195 7.84448 11.0712 8.15552 10.4864 8.6283C9.90785 9.11353 9.51594 9.54277 9.31065 9.91602C9.12403 10.3079 9.03072 10.7745 9.03072 11.3157V11.7449L9.04938 11.8569C9.04938 11.9316 9.06026 12 9.08204 12.0622C9.10381 12.1244 9.12558 12.1742 9.14736 12.2115C9.16913 12.2488 9.20645 12.2815 9.25933 12.3095C9.31221 12.3375 9.35264 12.3593 9.38064 12.3748C9.40863 12.3904 9.45995 12.4012 9.5346 12.4075C9.60925 12.4137 9.66058 12.4168 9.68857 12.4168H9.85187H10.0012C10.2065 12.4168 10.3589 12.409 10.4584 12.3935C10.5579 12.3779 10.6466 12.3313 10.7243 12.2535C10.8021 12.1757 10.841 12.056 10.841 11.8942C10.841 11.6827 10.8534 11.465 10.8783 11.2411C10.897 11.0109 10.9343 10.8305 10.9903 10.6998C11.0712 10.5008 11.3324 10.2208 11.7741 9.86003C12.6077 9.15707 13.1427 8.61587 13.3791 8.23639C13.6279 7.83204 13.7523 7.41524 13.7523 6.986C13.7523 6.17729 13.4102 5.48678 12.7259 4.91446C12.0603 4.30482 11.1458 4 9.9825 4C8.88763 4 8.00428 4.2986 7.33243 4.8958C6.71656 5.41835 6.36198 6.07154 6.26866 6.85537C6.25622 6.89269 6.25 6.9549 6.25 7.04199C6.25 7.29705 6.3402 7.51633 6.52061 7.69984C6.70101 7.88336 6.91563 7.97512 7.16446 7.97512C7.37597 7.97512 7.56571 7.90824 7.73367 7.77449C7.90163 7.64075 8.0105 7.47123 8.06026 7.26594H8.09759ZM10.0012 13.2939C9.62791 13.2939 9.30754 13.4246 9.04005 13.6858C8.77255 13.9471 8.6388 14.2644 8.6388 14.6376C8.6388 15.0047 8.77255 15.3235 9.04005 15.5941C9.30754 15.8647 9.62791 16 10.0012 16C10.3744 16 10.6948 15.8647 10.9623 15.5941C11.2298 15.3235 11.3635 15.0047 11.3635 14.6376C11.3635 14.2644 11.2298 13.9471 10.9623 13.6858C10.6948 13.4246 10.3744 13.2939 10.0012 13.2939Z' fill='white'/%3E%3C/svg%3E%0A");
     
+    --passed-icon: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17.1429 0H2.85714C1.27919 0 0 1.27919 0 2.85714V17.1429C0 18.7208 1.27919 20 2.85714 20H17.1429C18.7208 20 20 18.7208 20 17.1429V2.85714C20 1.27919 18.7208 0 17.1429 0Z' fill='%23039855'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15.1781 5.3131C15.7942 5.80597 15.8941 6.70496 15.4012 7.32105L9.68694 14.4639C9.19407 15.08 8.29508 15.1799 7.67899 14.687C7.0629 14.1941 6.96301 13.2951 7.45589 12.6791L13.1702 5.5362C13.663 4.92011 14.562 4.82023 15.1781 5.3131Z' fill='white'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M4.70415 9.70455C5.26204 9.14666 6.16656 9.14666 6.72446 9.70455L9.5816 12.5617C10.1395 13.1196 10.1395 14.0241 9.5816 14.582C9.02371 15.1399 8.11919 15.1399 7.56129 14.582L4.70415 11.7249C4.14626 11.167 4.14626 10.2624 4.70415 9.70455Z' fill='white'/%3E%3C/svg%3E%0A");
+    
   }
 
   * {
diff --git a/static/ejs/report.ejs b/static/ejs/report.ejs
index 258a1bf9..3c7fdd3f 100644
--- a/static/ejs/report.ejs
+++ b/static/ejs/report.ejs
@@ -18,17 +18,7 @@
     />
     <%- include('partials/styles/bootstrap') %> <%- include('partials/styles/highlightjs') %> <%-
     include('partials/styles/styles') %>
-  </head>
 
-  <body class="d-flex flex-column">
-    <%- include('partials/header') %> <%- include('partials/main') %> <%-
-    include('partials/scripts/popper') %> <%- include('partials/scripts/bootstrap') %> <%-
-    include('partials/scripts/highlightjs') %> <%- include('partials/scripts/utils') %> <%-
-    include('partials/scripts/categorySelectorDropdownScript') %> <%-
-    include('partials/scripts/categorySummary') %> <%- include('partials/scripts/ruleOffcanvas') %>
-    <%- include('partials/scripts/screenshotLightbox')%>
-    <!-- search feat changes -->
-    <%- include('partials/scripts/reportSearch') %>
     <script>
       const scanItems = <%- JSON.stringify(
           {
@@ -40,6 +30,17 @@
           }
         ) %>
     </script>
+  </head>
+
+  <body class="d-flex flex-column">
+    <%- include('partials/header') %> <%- include('partials/main') %> <%-
+    include('partials/scripts/popper') %> <%- include('partials/scripts/bootstrap') %> <%-
+    include('partials/scripts/highlightjs') %> <%- include('partials/scripts/utils') %> <%-
+    include('partials/scripts/categorySelectorDropdownScript') %> <%-
+    include('partials/scripts/categorySummary') %> <%- include('partials/scripts/ruleOffcanvas') %>
+    <%- include('partials/scripts/screenshotLightbox')%>
+    <!-- search feat changes -->
+    <%- include('partials/scripts/reportSearch') %>
     <script>
       function initTooltips() {
         const tooltipTriggerList = [].slice.call(