diff --git a/src/renderer/components/fields/Tooltip.test.tsx b/src/renderer/components/fields/Tooltip.test.tsx
index b6b759e8e..b06e5abb0 100644
--- a/src/renderer/components/fields/Tooltip.test.tsx
+++ b/src/renderer/components/fields/Tooltip.test.tsx
@@ -13,18 +13,33 @@ describe('renderer/components/fields/Tooltip.tsx', () => {
   it('should render', () => {
     renderWithAppContext(<Tooltip {...props} />);
 
-    expect(screen.getByTestId('tooltip-test')).toBeInTheDocument();
+    expect(screen.getByTestId('tooltip-icon-test')).toBeInTheDocument();
+    expect(screen.queryByText(props.tooltip as string)).not.toBeInTheDocument();
+  });
+
+  it('should toggle (show/hide) tooltip on clicking tooltip icon', async () => {
+    renderWithAppContext(<Tooltip {...props} />);
+
+    const tooltipIconElement = screen.getByTestId('tooltip-icon-test');
+
+    await userEvent.click(tooltipIconElement);
+    expect(screen.queryByText(props.tooltip as string)).toBeInTheDocument();
+
+    await userEvent.click(tooltipIconElement);
+    expect(screen.queryByText(props.tooltip as string)).not.toBeInTheDocument();
   });
 
-  it('should display on mouse enter / leave', async () => {
+  it('should hide tooltip contents on leave', async () => {
     renderWithAppContext(<Tooltip {...props} />);
 
-    const tooltipElement = screen.getByTestId('tooltip-test');
+    const tooltipIconElement = screen.getByTestId('tooltip-icon-test');
 
-    await userEvent.hover(tooltipElement);
+    await userEvent.click(tooltipIconElement);
     expect(screen.queryByText(props.tooltip as string)).toBeInTheDocument();
 
-    await userEvent.unhover(tooltipElement);
+    const tooltipContentElement = screen.getByTestId('tooltip-content-test');
+
+    await userEvent.unhover(tooltipContentElement);
     expect(screen.queryByText(props.tooltip as string)).not.toBeInTheDocument();
   });
 });
diff --git a/src/renderer/components/fields/Tooltip.tsx b/src/renderer/components/fields/Tooltip.tsx
index 3312dd468..fc6ed15f0 100644
--- a/src/renderer/components/fields/Tooltip.tsx
+++ b/src/renderer/components/fields/Tooltip.tsx
@@ -21,10 +21,9 @@ export const Tooltip: FC<TooltipProps> = (props: TooltipProps) => {
         <button
           {...anchorProps}
           aria-label={props.name}
-          data-testid={`tooltip-${props.name}`}
+          data-testid={`tooltip-icon-${props.name}`}
           id={props.name}
-          onMouseEnter={() => setShowTooltip(true)}
-          onMouseLeave={() => setShowTooltip(false)}
+          onClick={() => setShowTooltip(!showTooltip)}
           type="button"
         >
           <QuestionIcon className="text-gitify-tooltip-icon" />
@@ -38,6 +37,9 @@ export const Tooltip: FC<TooltipProps> = (props: TooltipProps) => {
           'text-left text-xs text-gitify-font',
           'rounded-sm border border-gray-300 shadow-sm bg-gitify-tooltip-popout',
         )}
+        data-testid={`tooltip-content-${props.name}`}
+        onMouseLeave={() => setShowTooltip(false)}
+        role="tooltip"
       >
         {props.tooltip}
       </div>
diff --git a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
index a8a2aece0..acb1ee119 100644
--- a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
@@ -536,7 +536,7 @@ exports[`renderer/components/fields/Checkbox.tsx should render - tooltip 1`] = `
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-appearance"
-              data-testid="tooltip-tooltip-appearance"
+              data-testid="tooltip-icon-tooltip-appearance"
               id="tooltip-appearance"
               tabindex="0"
               type="button"
@@ -599,7 +599,7 @@ exports[`renderer/components/fields/Checkbox.tsx should render - tooltip 1`] = `
             aria-expanded="false"
             aria-haspopup="true"
             aria-label="tooltip-appearance"
-            data-testid="tooltip-tooltip-appearance"
+            data-testid="tooltip-icon-tooltip-appearance"
             id="tooltip-appearance"
             tabindex="0"
             type="button"
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index 27dd93a47..5683b9eb0 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -35,7 +35,7 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       aria-expanded="false"
       aria-haspopup="true"
       aria-label="tooltip-Closed"
-      data-testid="tooltip-tooltip-Closed"
+      data-testid="tooltip-icon-tooltip-Closed"
       id="tooltip-Closed"
       tabindex="0"
       type="button"
@@ -142,7 +142,7 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       aria-expanded="false"
       aria-haspopup="true"
       aria-label="tooltip-Open"
-      data-testid="tooltip-tooltip-Open"
+      data-testid="tooltip-icon-tooltip-Open"
       id="tooltip-Open"
       tabindex="0"
       type="button"
@@ -195,7 +195,7 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       aria-expanded="false"
       aria-haspopup="true"
       aria-label="tooltip-Other"
-      data-testid="tooltip-tooltip-Other"
+      data-testid="tooltip-icon-tooltip-Other"
       id="tooltip-Other"
       tabindex="0"
       type="button"
@@ -261,7 +261,7 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       aria-expanded="false"
       aria-haspopup="true"
       aria-label="tooltip-Closed"
-      data-testid="tooltip-tooltip-Closed"
+      data-testid="tooltip-icon-tooltip-Closed"
       id="tooltip-Closed"
       tabindex="0"
       type="button"
@@ -369,7 +369,7 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       aria-expanded="false"
       aria-haspopup="true"
       aria-label="tooltip-Open"
-      data-testid="tooltip-tooltip-Open"
+      data-testid="tooltip-icon-tooltip-Open"
       id="tooltip-Open"
       tabindex="0"
       type="button"
@@ -422,7 +422,7 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       aria-expanded="false"
       aria-haspopup="true"
       aria-label="tooltip-Other"
-      data-testid="tooltip-tooltip-Other"
+      data-testid="tooltip-icon-tooltip-Other"
       id="tooltip-Other"
       tabindex="0"
       type="button"
@@ -542,7 +542,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Closed"
-                  data-testid="tooltip-tooltip-Closed"
+                  data-testid="tooltip-icon-tooltip-Closed"
                   id="tooltip-Closed"
                   tabindex="0"
                   type="button"
@@ -649,7 +649,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Open"
-                  data-testid="tooltip-tooltip-Open"
+                  data-testid="tooltip-icon-tooltip-Open"
                   id="tooltip-Open"
                   tabindex="0"
                   type="button"
@@ -702,7 +702,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Other"
-                  data-testid="tooltip-tooltip-Other"
+                  data-testid="tooltip-icon-tooltip-Other"
                   id="tooltip-Other"
                   tabindex="0"
                   type="button"
@@ -821,7 +821,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Closed"
-                data-testid="tooltip-tooltip-Closed"
+                data-testid="tooltip-icon-tooltip-Closed"
                 id="tooltip-Closed"
                 tabindex="0"
                 type="button"
@@ -928,7 +928,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Open"
-                data-testid="tooltip-tooltip-Open"
+                data-testid="tooltip-icon-tooltip-Open"
                 id="tooltip-Open"
                 tabindex="0"
                 type="button"
@@ -981,7 +981,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Other"
-                data-testid="tooltip-tooltip-Other"
+                data-testid="tooltip-icon-tooltip-Other"
                 id="tooltip-Other"
                 tabindex="0"
                 type="button"
@@ -1157,7 +1157,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Closed"
-                  data-testid="tooltip-tooltip-Closed"
+                  data-testid="tooltip-icon-tooltip-Closed"
                   id="tooltip-Closed"
                   tabindex="0"
                   type="button"
@@ -1264,7 +1264,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Open"
-                  data-testid="tooltip-tooltip-Open"
+                  data-testid="tooltip-icon-tooltip-Open"
                   id="tooltip-Open"
                   tabindex="0"
                   type="button"
@@ -1317,7 +1317,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Other"
-                  data-testid="tooltip-tooltip-Other"
+                  data-testid="tooltip-icon-tooltip-Other"
                   id="tooltip-Other"
                   tabindex="0"
                   type="button"
@@ -1436,7 +1436,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Closed"
-                data-testid="tooltip-tooltip-Closed"
+                data-testid="tooltip-icon-tooltip-Closed"
                 id="tooltip-Closed"
                 tabindex="0"
                 type="button"
@@ -1543,7 +1543,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Open"
-                data-testid="tooltip-tooltip-Open"
+                data-testid="tooltip-icon-tooltip-Open"
                 id="tooltip-Open"
                 tabindex="0"
                 type="button"
@@ -1596,7 +1596,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Other"
-                data-testid="tooltip-tooltip-Other"
+                data-testid="tooltip-icon-tooltip-Other"
                 id="tooltip-Other"
                 tabindex="0"
                 type="button"
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index 61c02d8aa..25abcbc1f 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                     aria-expanded="false"
                     aria-haspopup="true"
                     aria-label="tooltip-reason"
-                    data-testid="tooltip-tooltip-reason"
+                    data-testid="tooltip-icon-tooltip-reason"
                     id="tooltip-reason"
                     tabindex="0"
                     type="button"
@@ -115,7 +115,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Approval Requested"
-                  data-testid="tooltip-tooltip-Approval Requested"
+                  data-testid="tooltip-icon-tooltip-Approval Requested"
                   id="tooltip-Approval Requested"
                   tabindex="0"
                   type="button"
@@ -168,7 +168,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Assigned"
-                  data-testid="tooltip-tooltip-Assigned"
+                  data-testid="tooltip-icon-tooltip-Assigned"
                   id="tooltip-Assigned"
                   tabindex="0"
                   type="button"
@@ -221,7 +221,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Authored"
-                  data-testid="tooltip-tooltip-Authored"
+                  data-testid="tooltip-icon-tooltip-Authored"
                   id="tooltip-Authored"
                   tabindex="0"
                   type="button"
@@ -274,7 +274,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Commented"
-                  data-testid="tooltip-tooltip-Commented"
+                  data-testid="tooltip-icon-tooltip-Commented"
                   id="tooltip-Commented"
                   tabindex="0"
                   type="button"
@@ -327,7 +327,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Invitation Received"
-                  data-testid="tooltip-tooltip-Invitation Received"
+                  data-testid="tooltip-icon-tooltip-Invitation Received"
                   id="tooltip-Invitation Received"
                   tabindex="0"
                   type="button"
@@ -380,7 +380,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Member Feature Requested"
-                  data-testid="tooltip-tooltip-Member Feature Requested"
+                  data-testid="tooltip-icon-tooltip-Member Feature Requested"
                   id="tooltip-Member Feature Requested"
                   tabindex="0"
                   type="button"
@@ -433,7 +433,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Mentioned"
-                  data-testid="tooltip-tooltip-Mentioned"
+                  data-testid="tooltip-icon-tooltip-Mentioned"
                   id="tooltip-Mentioned"
                   tabindex="0"
                   type="button"
@@ -486,7 +486,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Review Requested"
-                  data-testid="tooltip-tooltip-Review Requested"
+                  data-testid="tooltip-icon-tooltip-Review Requested"
                   id="tooltip-Review Requested"
                   tabindex="0"
                   type="button"
@@ -539,7 +539,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Security Advisory Credit Received"
-                  data-testid="tooltip-tooltip-Security Advisory Credit Received"
+                  data-testid="tooltip-icon-tooltip-Security Advisory Credit Received"
                   id="tooltip-Security Advisory Credit Received"
                   tabindex="0"
                   type="button"
@@ -592,7 +592,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Security Alert Received"
-                  data-testid="tooltip-tooltip-Security Alert Received"
+                  data-testid="tooltip-icon-tooltip-Security Alert Received"
                   id="tooltip-Security Alert Received"
                   tabindex="0"
                   type="button"
@@ -645,7 +645,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-State Changed"
-                  data-testid="tooltip-tooltip-State Changed"
+                  data-testid="tooltip-icon-tooltip-State Changed"
                   id="tooltip-State Changed"
                   tabindex="0"
                   type="button"
@@ -698,7 +698,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Team Mentioned"
-                  data-testid="tooltip-tooltip-Team Mentioned"
+                  data-testid="tooltip-icon-tooltip-Team Mentioned"
                   id="tooltip-Team Mentioned"
                   tabindex="0"
                   type="button"
@@ -751,7 +751,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Updated"
-                  data-testid="tooltip-tooltip-Updated"
+                  data-testid="tooltip-icon-tooltip-Updated"
                   id="tooltip-Updated"
                   tabindex="0"
                   type="button"
@@ -804,7 +804,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Updated"
-                  data-testid="tooltip-tooltip-Updated"
+                  data-testid="tooltip-icon-tooltip-Updated"
                   id="tooltip-Updated"
                   tabindex="0"
                   type="button"
@@ -857,7 +857,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Workflow Run Completed"
-                  data-testid="tooltip-tooltip-Workflow Run Completed"
+                  data-testid="tooltip-icon-tooltip-Workflow Run Completed"
                   id="tooltip-Workflow Run Completed"
                   tabindex="0"
                   type="button"
@@ -943,7 +943,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-reason"
-                  data-testid="tooltip-tooltip-reason"
+                  data-testid="tooltip-icon-tooltip-reason"
                   id="tooltip-reason"
                   tabindex="0"
                   type="button"
@@ -1002,7 +1002,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Approval Requested"
-                data-testid="tooltip-tooltip-Approval Requested"
+                data-testid="tooltip-icon-tooltip-Approval Requested"
                 id="tooltip-Approval Requested"
                 tabindex="0"
                 type="button"
@@ -1055,7 +1055,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Assigned"
-                data-testid="tooltip-tooltip-Assigned"
+                data-testid="tooltip-icon-tooltip-Assigned"
                 id="tooltip-Assigned"
                 tabindex="0"
                 type="button"
@@ -1108,7 +1108,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Authored"
-                data-testid="tooltip-tooltip-Authored"
+                data-testid="tooltip-icon-tooltip-Authored"
                 id="tooltip-Authored"
                 tabindex="0"
                 type="button"
@@ -1161,7 +1161,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Commented"
-                data-testid="tooltip-tooltip-Commented"
+                data-testid="tooltip-icon-tooltip-Commented"
                 id="tooltip-Commented"
                 tabindex="0"
                 type="button"
@@ -1214,7 +1214,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Invitation Received"
-                data-testid="tooltip-tooltip-Invitation Received"
+                data-testid="tooltip-icon-tooltip-Invitation Received"
                 id="tooltip-Invitation Received"
                 tabindex="0"
                 type="button"
@@ -1267,7 +1267,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Member Feature Requested"
-                data-testid="tooltip-tooltip-Member Feature Requested"
+                data-testid="tooltip-icon-tooltip-Member Feature Requested"
                 id="tooltip-Member Feature Requested"
                 tabindex="0"
                 type="button"
@@ -1320,7 +1320,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Mentioned"
-                data-testid="tooltip-tooltip-Mentioned"
+                data-testid="tooltip-icon-tooltip-Mentioned"
                 id="tooltip-Mentioned"
                 tabindex="0"
                 type="button"
@@ -1373,7 +1373,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Review Requested"
-                data-testid="tooltip-tooltip-Review Requested"
+                data-testid="tooltip-icon-tooltip-Review Requested"
                 id="tooltip-Review Requested"
                 tabindex="0"
                 type="button"
@@ -1426,7 +1426,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Security Advisory Credit Received"
-                data-testid="tooltip-tooltip-Security Advisory Credit Received"
+                data-testid="tooltip-icon-tooltip-Security Advisory Credit Received"
                 id="tooltip-Security Advisory Credit Received"
                 tabindex="0"
                 type="button"
@@ -1479,7 +1479,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Security Alert Received"
-                data-testid="tooltip-tooltip-Security Alert Received"
+                data-testid="tooltip-icon-tooltip-Security Alert Received"
                 id="tooltip-Security Alert Received"
                 tabindex="0"
                 type="button"
@@ -1532,7 +1532,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-State Changed"
-                data-testid="tooltip-tooltip-State Changed"
+                data-testid="tooltip-icon-tooltip-State Changed"
                 id="tooltip-State Changed"
                 tabindex="0"
                 type="button"
@@ -1585,7 +1585,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Team Mentioned"
-                data-testid="tooltip-tooltip-Team Mentioned"
+                data-testid="tooltip-icon-tooltip-Team Mentioned"
                 id="tooltip-Team Mentioned"
                 tabindex="0"
                 type="button"
@@ -1638,7 +1638,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Updated"
-                data-testid="tooltip-tooltip-Updated"
+                data-testid="tooltip-icon-tooltip-Updated"
                 id="tooltip-Updated"
                 tabindex="0"
                 type="button"
@@ -1691,7 +1691,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Updated"
-                data-testid="tooltip-tooltip-Updated"
+                data-testid="tooltip-icon-tooltip-Updated"
                 id="tooltip-Updated"
                 tabindex="0"
                 type="button"
@@ -1744,7 +1744,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Workflow Run Completed"
-                data-testid="tooltip-tooltip-Workflow Run Completed"
+                data-testid="tooltip-icon-tooltip-Workflow Run Completed"
                 id="tooltip-Workflow Run Completed"
                 tabindex="0"
                 type="button"
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index 2aac188ef..e1dc74e35 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -59,7 +59,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                     aria-expanded="false"
                     aria-haspopup="true"
                     aria-label="tooltip-state"
-                    data-testid="tooltip-tooltip-state"
+                    data-testid="tooltip-icon-tooltip-state"
                     id="tooltip-state"
                     tabindex="0"
                     type="button"
@@ -118,7 +118,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Closed"
-                  data-testid="tooltip-tooltip-Closed"
+                  data-testid="tooltip-icon-tooltip-Closed"
                   id="tooltip-Closed"
                   tabindex="0"
                   type="button"
@@ -225,7 +225,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Open"
-                  data-testid="tooltip-tooltip-Open"
+                  data-testid="tooltip-icon-tooltip-Open"
                   id="tooltip-Open"
                   tabindex="0"
                   type="button"
@@ -278,7 +278,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Other"
-                  data-testid="tooltip-tooltip-Other"
+                  data-testid="tooltip-icon-tooltip-Other"
                   id="tooltip-Other"
                   tabindex="0"
                   type="button"
@@ -367,7 +367,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-state"
-                  data-testid="tooltip-tooltip-state"
+                  data-testid="tooltip-icon-tooltip-state"
                   id="tooltip-state"
                   tabindex="0"
                   type="button"
@@ -426,7 +426,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Closed"
-                data-testid="tooltip-tooltip-Closed"
+                data-testid="tooltip-icon-tooltip-Closed"
                 id="tooltip-Closed"
                 tabindex="0"
                 type="button"
@@ -533,7 +533,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Open"
-                data-testid="tooltip-tooltip-Open"
+                data-testid="tooltip-icon-tooltip-Open"
                 id="tooltip-Open"
                 tabindex="0"
                 type="button"
@@ -586,7 +586,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Other"
-                data-testid="tooltip-tooltip-Other"
+                data-testid="tooltip-icon-tooltip-Other"
                 id="tooltip-Other"
                 tabindex="0"
                 type="button"
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index fa77cb125..9f745fc1d 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
                     aria-expanded="false"
                     aria-haspopup="true"
                     aria-label="tooltip-type"
-                    data-testid="tooltip-tooltip-type"
+                    data-testid="tooltip-icon-tooltip-type"
                     id="tooltip-type"
                     tabindex="0"
                     type="button"
@@ -418,7 +418,7 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-type"
-                  data-testid="tooltip-tooltip-type"
+                  data-testid="tooltip-icon-tooltip-type"
                   id="tooltip-type"
                   tabindex="0"
                   type="button"
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index 5e0bfea17..2c664ac5a 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                     aria-expanded="false"
                     aria-haspopup="true"
                     aria-label="tooltip-user-type"
-                    data-testid="tooltip-tooltip-user-type"
+                    data-testid="tooltip-icon-tooltip-user-type"
                     id="tooltip-user-type"
                     tabindex="0"
                     type="button"
@@ -115,7 +115,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-Bot"
-                  data-testid="tooltip-tooltip-Bot"
+                  data-testid="tooltip-icon-tooltip-Bot"
                   id="tooltip-Bot"
                   tabindex="0"
                   type="button"
@@ -255,7 +255,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-user-type"
-                  data-testid="tooltip-tooltip-user-type"
+                  data-testid="tooltip-icon-tooltip-user-type"
                   id="tooltip-user-type"
                   tabindex="0"
                   type="button"
@@ -314,7 +314,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-Bot"
-                data-testid="tooltip-tooltip-Bot"
+                data-testid="tooltip-icon-tooltip-Bot"
                 id="tooltip-Bot"
                 tabindex="0"
                 type="button"
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 648bf8c76..7645681ff 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -258,7 +258,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
       'tooltip-showOnlyParticipating',
     );
 
-    await userEvent.hover(tooltipElement);
+    await userEvent.click(tooltipElement);
     await userEvent.click(
       screen.getByTitle(
         'Open GitHub documentation for participating and watching notifications',
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index 6d2b51c6c..4d7125ce2 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -136,7 +136,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-search"
-                data-testid="tooltip-tooltip-search"
+                data-testid="tooltip-icon-tooltip-search"
                 id="tooltip-search"
                 tabindex="0"
                 type="button"
@@ -358,7 +358,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-user-type"
-                data-testid="tooltip-tooltip-user-type"
+                data-testid="tooltip-icon-tooltip-user-type"
                 id="tooltip-user-type"
                 tabindex="0"
                 type="button"
@@ -417,7 +417,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Bot"
-              data-testid="tooltip-tooltip-Bot"
+              data-testid="tooltip-icon-tooltip-Bot"
               id="tooltip-Bot"
               tabindex="0"
               type="button"
@@ -543,7 +543,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-type"
-                data-testid="tooltip-tooltip-type"
+                data-testid="tooltip-icon-tooltip-type"
                 id="tooltip-type"
                 tabindex="0"
                 type="button"
@@ -894,7 +894,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-state"
-                data-testid="tooltip-tooltip-state"
+                data-testid="tooltip-icon-tooltip-state"
                 id="tooltip-state"
                 tabindex="0"
                 type="button"
@@ -953,7 +953,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
+              data-testid="tooltip-icon-tooltip-Closed"
               id="tooltip-Closed"
               tabindex="0"
               type="button"
@@ -1060,7 +1060,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
+              data-testid="tooltip-icon-tooltip-Open"
               id="tooltip-Open"
               tabindex="0"
               type="button"
@@ -1113,7 +1113,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Other"
-              data-testid="tooltip-tooltip-Other"
+              data-testid="tooltip-icon-tooltip-Other"
               id="tooltip-Other"
               tabindex="0"
               type="button"
@@ -1185,7 +1185,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="tooltip-reason"
-                data-testid="tooltip-tooltip-reason"
+                data-testid="tooltip-icon-tooltip-reason"
                 id="tooltip-reason"
                 tabindex="0"
                 type="button"
@@ -1244,7 +1244,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Approval Requested"
-              data-testid="tooltip-tooltip-Approval Requested"
+              data-testid="tooltip-icon-tooltip-Approval Requested"
               id="tooltip-Approval Requested"
               tabindex="0"
               type="button"
@@ -1297,7 +1297,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Assigned"
-              data-testid="tooltip-tooltip-Assigned"
+              data-testid="tooltip-icon-tooltip-Assigned"
               id="tooltip-Assigned"
               tabindex="0"
               type="button"
@@ -1350,7 +1350,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Authored"
-              data-testid="tooltip-tooltip-Authored"
+              data-testid="tooltip-icon-tooltip-Authored"
               id="tooltip-Authored"
               tabindex="0"
               type="button"
@@ -1403,7 +1403,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Commented"
-              data-testid="tooltip-tooltip-Commented"
+              data-testid="tooltip-icon-tooltip-Commented"
               id="tooltip-Commented"
               tabindex="0"
               type="button"
@@ -1456,7 +1456,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Invitation Received"
-              data-testid="tooltip-tooltip-Invitation Received"
+              data-testid="tooltip-icon-tooltip-Invitation Received"
               id="tooltip-Invitation Received"
               tabindex="0"
               type="button"
@@ -1509,7 +1509,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Member Feature Requested"
-              data-testid="tooltip-tooltip-Member Feature Requested"
+              data-testid="tooltip-icon-tooltip-Member Feature Requested"
               id="tooltip-Member Feature Requested"
               tabindex="0"
               type="button"
@@ -1562,7 +1562,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Mentioned"
-              data-testid="tooltip-tooltip-Mentioned"
+              data-testid="tooltip-icon-tooltip-Mentioned"
               id="tooltip-Mentioned"
               tabindex="0"
               type="button"
@@ -1615,7 +1615,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Review Requested"
-              data-testid="tooltip-tooltip-Review Requested"
+              data-testid="tooltip-icon-tooltip-Review Requested"
               id="tooltip-Review Requested"
               tabindex="0"
               type="button"
@@ -1668,7 +1668,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Security Advisory Credit Received"
-              data-testid="tooltip-tooltip-Security Advisory Credit Received"
+              data-testid="tooltip-icon-tooltip-Security Advisory Credit Received"
               id="tooltip-Security Advisory Credit Received"
               tabindex="0"
               type="button"
@@ -1721,7 +1721,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Security Alert Received"
-              data-testid="tooltip-tooltip-Security Alert Received"
+              data-testid="tooltip-icon-tooltip-Security Alert Received"
               id="tooltip-Security Alert Received"
               tabindex="0"
               type="button"
@@ -1774,7 +1774,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-State Changed"
-              data-testid="tooltip-tooltip-State Changed"
+              data-testid="tooltip-icon-tooltip-State Changed"
               id="tooltip-State Changed"
               tabindex="0"
               type="button"
@@ -1827,7 +1827,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Team Mentioned"
-              data-testid="tooltip-tooltip-Team Mentioned"
+              data-testid="tooltip-icon-tooltip-Team Mentioned"
               id="tooltip-Team Mentioned"
               tabindex="0"
               type="button"
@@ -1880,7 +1880,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Updated"
-              data-testid="tooltip-tooltip-Updated"
+              data-testid="tooltip-icon-tooltip-Updated"
               id="tooltip-Updated"
               tabindex="0"
               type="button"
@@ -1933,7 +1933,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Updated"
-              data-testid="tooltip-tooltip-Updated"
+              data-testid="tooltip-icon-tooltip-Updated"
               id="tooltip-Updated"
               tabindex="0"
               type="button"
@@ -1986,7 +1986,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-Workflow Run Completed"
-              data-testid="tooltip-tooltip-Workflow Run Completed"
+              data-testid="tooltip-icon-tooltip-Workflow Run Completed"
               id="tooltip-Workflow Run Completed"
               tabindex="0"
               type="button"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index a49af8031..57583e3d1 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -260,7 +260,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-increaseContrast"
-              data-testid="tooltip-tooltip-increaseContrast"
+              data-testid="tooltip-icon-tooltip-increaseContrast"
               id="tooltip-increaseContrast"
               tabindex="0"
               type="button"
@@ -450,7 +450,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-wrapNotificationTitle"
-              data-testid="tooltip-tooltip-wrapNotificationTitle"
+              data-testid="tooltip-icon-tooltip-wrapNotificationTitle"
               id="tooltip-wrapNotificationTitle"
               tabindex="0"
               type="button"
@@ -591,7 +591,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-groupBy"
-              data-testid="tooltip-tooltip-groupBy"
+              data-testid="tooltip-icon-tooltip-groupBy"
               id="tooltip-groupBy"
               tabindex="0"
               type="button"
@@ -682,7 +682,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-fetchType"
-              data-testid="tooltip-tooltip-fetchType"
+              data-testid="tooltip-icon-tooltip-fetchType"
               id="tooltip-fetchType"
               tabindex="0"
               type="button"
@@ -866,7 +866,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-fetchAllNotifications"
-              data-testid="tooltip-tooltip-fetchAllNotifications"
+              data-testid="tooltip-icon-tooltip-fetchAllNotifications"
               id="tooltip-fetchAllNotifications"
               tabindex="0"
               type="button"
@@ -915,7 +915,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-detailedNotifications"
-              data-testid="tooltip-tooltip-detailedNotifications"
+              data-testid="tooltip-icon-tooltip-detailedNotifications"
               id="tooltip-detailedNotifications"
               tabindex="0"
               type="button"
@@ -976,7 +976,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-showPills"
-                  data-testid="tooltip-tooltip-showPills"
+                  data-testid="tooltip-icon-tooltip-showPills"
                   id="tooltip-showPills"
                   tabindex="0"
                   type="button"
@@ -1025,7 +1025,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
                   aria-expanded="false"
                   aria-haspopup="true"
                   aria-label="tooltip-showNumber"
-                  data-testid="tooltip-tooltip-showNumber"
+                  data-testid="tooltip-icon-tooltip-showNumber"
                   id="tooltip-showNumber"
                   tabindex="0"
                   type="button"
@@ -1075,7 +1075,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-showOnlyParticipating"
-              data-testid="tooltip-tooltip-showOnlyParticipating"
+              data-testid="tooltip-icon-tooltip-showOnlyParticipating"
               id="tooltip-showOnlyParticipating"
               tabindex="0"
               type="button"
@@ -1123,7 +1123,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-markAsDoneOnOpen"
-              data-testid="tooltip-tooltip-markAsDoneOnOpen"
+              data-testid="tooltip-icon-tooltip-markAsDoneOnOpen"
               id="tooltip-markAsDoneOnOpen"
               tabindex="0"
               type="button"
@@ -1171,7 +1171,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-markAsDoneOnUnsubscribe"
-              data-testid="tooltip-tooltip-markAsDoneOnUnsubscribe"
+              data-testid="tooltip-icon-tooltip-markAsDoneOnUnsubscribe"
               id="tooltip-markAsDoneOnUnsubscribe"
               tabindex="0"
               type="button"
@@ -1219,7 +1219,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-delayNotificationState"
-              data-testid="tooltip-tooltip-delayNotificationState"
+              data-testid="tooltip-icon-tooltip-delayNotificationState"
               id="tooltip-delayNotificationState"
               tabindex="0"
               type="button"
@@ -1321,7 +1321,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-showNotificationsCountInTray"
-              data-testid="tooltip-tooltip-showNotificationsCountInTray"
+              data-testid="tooltip-icon-tooltip-showNotificationsCountInTray"
               id="tooltip-showNotificationsCountInTray"
               tabindex="0"
               type="button"
@@ -1370,7 +1370,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-useUnreadActiveIcon"
-              data-testid="tooltip-tooltip-useUnreadActiveIcon"
+              data-testid="tooltip-icon-tooltip-useUnreadActiveIcon"
               id="tooltip-useUnreadActiveIcon"
               tabindex="0"
               type="button"
@@ -1418,7 +1418,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-useAlternateIdleIcon"
-              data-testid="tooltip-tooltip-useAlternateIdleIcon"
+              data-testid="tooltip-icon-tooltip-useAlternateIdleIcon"
               id="tooltip-useAlternateIdleIcon"
               tabindex="0"
               type="button"
@@ -1559,7 +1559,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-openLinks"
-              data-testid="tooltip-tooltip-openLinks"
+              data-testid="tooltip-icon-tooltip-openLinks"
               id="tooltip-openLinks"
               tabindex="0"
               type="button"
@@ -1608,7 +1608,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-keyboardShortcut"
-              data-testid="tooltip-tooltip-keyboardShortcut"
+              data-testid="tooltip-icon-tooltip-keyboardShortcut"
               id="tooltip-keyboardShortcut"
               tabindex="0"
               type="button"
@@ -1657,7 +1657,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-showNotifications"
-              data-testid="tooltip-tooltip-showNotifications"
+              data-testid="tooltip-icon-tooltip-showNotifications"
               id="tooltip-showNotifications"
               tabindex="0"
               type="button"
@@ -1865,7 +1865,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               aria-expanded="false"
               aria-haspopup="true"
               aria-label="tooltip-openAtStartup"
-              data-testid="tooltip-tooltip-openAtStartup"
+              data-testid="tooltip-icon-tooltip-openAtStartup"
               id="tooltip-openAtStartup"
               tabindex="0"
               type="button"