diff --git a/src/renderer/components/filters/FilterSection.tsx b/src/renderer/components/filters/FilterSection.tsx
index 47dbf8517..9fc98e521 100644
--- a/src/renderer/components/filters/FilterSection.tsx
+++ b/src/renderer/components/filters/FilterSection.tsx
@@ -7,7 +7,6 @@ import { AppContext } from '../../context/App';
 import type { FilterSettingsState, FilterValue } from '../../types';
 import type { Filter } from '../../utils/notifications/filters';
 import { Checkbox } from '../fields/Checkbox';
-import { Tooltip } from '../fields/Tooltip';
 import { Title } from '../primitives/Title';
 import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
@@ -34,22 +33,21 @@ export const FilterSection = <T extends FilterValue>({
 
   return (
     <fieldset id={id}>
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={icon}>{title}</Title>
-        {tooltip && (
-          <Tooltip
-            name={`tooltip-${id}`}
-            tooltip={
-              <Stack direction="vertical" gap="condensed">
-                {tooltip}
-                {filter.requiresDetailsNotifications && (
-                  <RequiresDetailedNotificationWarning />
-                )}
-              </Stack>
-            }
-          />
-        )}
-      </Stack>
+      <Title
+        icon={icon}
+        tooltip={
+          tooltip && (
+            <>
+              {tooltip}
+              {filter.requiresDetailsNotifications && (
+                <RequiresDetailedNotificationWarning />
+              )}
+            </>
+          )
+        }
+      >
+        {title}
+      </Title>
 
       <Stack
         direction={layout}
diff --git a/src/renderer/components/filters/OrganizationFilter.tsx b/src/renderer/components/filters/OrganizationFilter.tsx
index 0bea7ab21..e0607c1ea 100644
--- a/src/renderer/components/filters/OrganizationFilter.tsx
+++ b/src/renderer/components/filters/OrganizationFilter.tsx
@@ -13,7 +13,6 @@ import {
   hasExcludeOrganizationFilters,
   hasIncludeOrganizationFilters,
 } from '../../utils/notifications/filters/organizations';
-import { Tooltip } from '../fields/Tooltip';
 import { Title } from '../primitives/Title';
 
 type InputToken = {
@@ -135,17 +134,17 @@ export const OrganizationFilter: FC = () => {
 
   return (
     <fieldset id="filter-organizations">
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={OrganizationIcon}>Organizations</Title>
-        <Tooltip
-          name="tooltip-filter-organizations"
-          tooltip={
-            <Stack direction="vertical" gap="condensed">
-              <Text>Filter notifications by organization.</Text>
-            </Stack>
-          }
-        />
-      </Stack>
+      <Title
+        icon={OrganizationIcon}
+        tooltip={
+          <Stack direction="vertical" gap="condensed">
+            <Text>Filter notifications by organization.</Text>
+          </Stack>
+        }
+      >
+        Organizations
+      </Title>
+
       <Stack direction="vertical" gap="condensed">
         <Stack
           align="center"
diff --git a/src/renderer/components/filters/UserHandleFilter.tsx b/src/renderer/components/filters/UserHandleFilter.tsx
index 9c96a7e7b..21a313a2f 100644
--- a/src/renderer/components/filters/UserHandleFilter.tsx
+++ b/src/renderer/components/filters/UserHandleFilter.tsx
@@ -13,7 +13,6 @@ import {
   hasExcludeHandleFilters,
   hasIncludeHandleFilters,
 } from '../../utils/notifications/filters/handles';
-import { Tooltip } from '../fields/Tooltip';
 import { Title } from '../primitives/Title';
 import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
@@ -121,18 +120,18 @@ export const UserHandleFilter: FC = () => {
 
   return (
     <fieldset id="filter-user-handles">
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={MentionIcon}>Handles</Title>
-        <Tooltip
-          name="tooltip-filter-handles"
-          tooltip={
-            <Stack direction="vertical" gap="condensed">
-              <Text>Filter notifications by user handle.</Text>
-              <RequiresDetailedNotificationWarning />
-            </Stack>
-          }
-        />
-      </Stack>
+      <Title
+        icon={MentionIcon}
+        tooltip={
+          <Stack direction="vertical" gap="condensed">
+            <Text>Filter notifications by user handle.</Text>
+            <RequiresDetailedNotificationWarning />
+          </Stack>
+        }
+      >
+        Handles
+      </Title>
+
       <Stack direction="vertical" gap="condensed">
         <Stack
           align="center"
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index baa7eb0d1..c080cd2dc 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -443,55 +443,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
       <fieldset
         id="FilterSectionTest"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-filtersectiontitle"
             >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="filtersectiontitle"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mark-github"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  FilterSectionTitle
-                </h2>
-              </div>
+                FilterSectionTitle
+              </h2>
             </div>
-          </legend>
-        </div>
+          </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -713,55 +703,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
     <fieldset
       id="FilterSectionTest"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-filtersectiontitle"
           >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="filtersectiontitle"
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                />
-              </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                FilterSectionTitle
-              </h2>
-            </div>
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              FilterSectionTitle
+            </h2>
           </div>
-        </legend>
-      </div>
+        </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
@@ -1040,55 +1020,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
       <fieldset
         id="FilterSectionTest"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-filtersectiontitle"
             >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="filtersectiontitle"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mark-github"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  FilterSectionTitle
-                </h2>
-              </div>
+                FilterSectionTitle
+              </h2>
             </div>
-          </legend>
-        </div>
+          </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -1310,55 +1280,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
     <fieldset
       id="FilterSectionTest"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-filtersectiontitle"
           >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="filtersectiontitle"
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                />
-              </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                FilterSectionTitle
-              </h2>
-            </div>
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              FilterSectionTitle
+            </h2>
           </div>
-        </legend>
-      </div>
+        </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index 923c279b8..ef51bd517 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -8,32 +8,51 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
       <fieldset
         id="filter-reasons"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-reason"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-note"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Reason
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="reason"
+                aria-label="tooltip-reason"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-reason"
+                id="tooltip-reason"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-note"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,42 +63,13 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   width="16"
                 >
                   <path
-                    d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Reason
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-reasons"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-reasons"
-            id="tooltip-filter-reasons"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -847,32 +837,51 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
     <fieldset
       id="filter-reasons"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-reason"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-note"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              Reason
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="reason"
+              aria-label="tooltip-reason"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-reason"
+              id="tooltip-reason"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-note"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -883,42 +892,13 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 width="16"
               >
                 <path
-                  d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Reason
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-reasons"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-reasons"
-          id="tooltip-filter-reasons"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index be2e10838..0a1cff88f 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -8,32 +8,54 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
       <fieldset
         id="filter-state"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-state"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                State
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="state"
+                aria-label="tooltip-state"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-state"
+                id="tooltip-state"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-issue-opened"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,45 +66,13 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                   width="16"
                 >
                   <path
-                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                  />
-                  <path
-                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  State
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-state"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-state"
-            id="tooltip-filter-state"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -304,32 +294,54 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
     <fieldset
       id="filter-state"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-state"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-issue-opened"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+              />
+              <path
+                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              State
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="state"
+              aria-label="tooltip-state"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-state"
+              id="tooltip-state"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-issue-opened"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -340,45 +352,13 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                 width="16"
               >
                 <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                State
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-state"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-state"
-          id="tooltip-filter-state"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index 763193dba..b113c009d 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -8,32 +8,51 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
       <fieldset
         id="filter-subject-type"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="type"
+                aria-label="tooltip-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-type"
+                id="tooltip-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,42 +63,13 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
                   width="16"
                 >
                   <path
-                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Type
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-subject-type"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-subject-type"
-            id="tooltip-filter-subject-type"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -367,32 +357,51 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
     <fieldset
       id="filter-subject-type"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-type"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-bell"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              Type
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="type"
+              aria-label="tooltip-type"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-type"
+              id="tooltip-type"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -403,42 +412,13 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
                 width="16"
               >
                 <path
-                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Type
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-subject-type"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-subject-type"
-          id="tooltip-filter-subject-type"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/UserHandleFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserHandleFilter.test.tsx.snap
index d19785def..832efcaf9 100644
--- a/src/renderer/components/filters/__snapshots__/UserHandleFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserHandleFilter.test.tsx.snap
@@ -8,32 +8,51 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
       <fieldset
         id="filter-user-handles"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-handles"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mention"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Handles
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="handles"
+                aria-label="tooltip-handles"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-handles"
+                id="tooltip-handles"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-mention"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,42 +63,13 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
                   width="16"
                 >
                   <path
-                    d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Handles
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-handles"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-handles"
-            id="tooltip-filter-handles"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -237,32 +227,51 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
     <fieldset
       id="filter-user-handles"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-handles"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mention"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              Handles
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="handles"
+              aria-label="tooltip-handles"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-handles"
+              id="tooltip-handles"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-mention"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -273,42 +282,13 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
                 width="16"
               >
                 <path
-                  d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Handles
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-handles"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-handles"
-          id="tooltip-filter-handles"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
@@ -523,32 +503,51 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
       <fieldset
         id="filter-user-handles"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-handles"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mention"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Handles
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="handles"
+                aria-label="tooltip-handles"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-handles"
+                id="tooltip-handles"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-mention"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -559,42 +558,13 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
                   width="16"
                 >
                   <path
-                    d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Handles
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-handles"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-handles"
-            id="tooltip-filter-handles"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -750,32 +720,51 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
     <fieldset
       id="filter-user-handles"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-handles"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mention"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              Handles
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="handles"
+              aria-label="tooltip-handles"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-handles"
+              id="tooltip-handles"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-mention"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -786,42 +775,13 @@ exports[`renderer/components/filters/UserHandleFilter.tsx should render itself &
                 width="16"
               >
                 <path
-                  d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Handles
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-handles"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-handles"
-          id="tooltip-filter-handles"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index 088c5eadf..69c78ceb7 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -8,32 +8,51 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
       <fieldset
         id="filter-user-types"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-user-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-feed-person"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                User Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="user-type"
+                aria-label="tooltip-user-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-user-type"
+                id="tooltip-user-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-feed-person"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,42 +63,13 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                   width="16"
                 >
                   <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  User Type
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-user-types"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-user-types"
-            id="tooltip-filter-user-types"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -201,32 +191,51 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
     <fieldset
       id="filter-user-types"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-user-type"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-feed-person"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              User Type
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="user-type"
+              aria-label="tooltip-user-type"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-user-type"
+              id="tooltip-user-type"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-feed-person"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -237,42 +246,13 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                 width="16"
               >
                 <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                User Type
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-user-types"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-user-types"
-          id="tooltip-filter-user-types"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/primitives/Title.tsx b/src/renderer/components/primitives/Title.tsx
index b55fba6b8..d589bacce 100644
--- a/src/renderer/components/primitives/Title.tsx
+++ b/src/renderer/components/primitives/Title.tsx
@@ -1,15 +1,20 @@
-import type { FC } from 'react';
+import type { FC, ReactNode } from 'react';
 
 import type { Icon } from '@primer/octicons-react';
 import { Box, Heading, Stack } from '@primer/react';
 
+import { Tooltip } from '../fields/Tooltip';
+
 interface ITitle {
   icon: Icon;
   children: string;
   size?: number;
+  tooltip?: ReactNode;
 }
 
 export const Title: FC<ITitle> = ({ size = 2, ...props }) => {
+  const name = props.children.toLowerCase().replace(' ', '-');
+
   return (
     <legend>
       <Box className="mb-2">
@@ -17,10 +22,20 @@ export const Title: FC<ITitle> = ({ size = 2, ...props }) => {
           align="center"
           direction="horizontal"
           gap="condensed"
-          id={props.children.toLowerCase().replace(' ', '-')}
+          id={`title-${name}`}
         >
           <props.icon size="small" />
           <Heading sx={{ fontSize: size }}>{props.children}</Heading>
+          {props.tooltip && (
+            <Tooltip
+              name={`tooltip-${name}`}
+              tooltip={
+                <Stack direction="vertical" gap="condensed">
+                  {props.tooltip}
+                </Stack>
+              }
+            />
+          )}
         </Stack>
       </Box>
     </legend>
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index 8beccf1ae..6ab3e59d1 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="test-header"
+                id="title-test-header"
               >
                 <svg
                   aria-hidden="true"
@@ -139,7 +139,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="test-header"
+              id="title-test-header"
             >
               <svg
                 aria-hidden="true"
diff --git a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
index e5966e391..1f81c39a5 100644
--- a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`renderer/routes/components/primitives/Title.tsx should render the title
         data-justify="start"
         data-padding="none"
         data-wrap="nowrap"
-        id="legend"
+        id="title-legend"
       >
         <svg
           aria-hidden="true"
@@ -58,7 +58,7 @@ exports[`renderer/routes/components/primitives/Title.tsx should render the title
         data-justify="start"
         data-padding="none"
         data-wrap="nowrap"
-        id="legend"
+        id="title-legend"
       >
         <svg
           aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
index 85b80b92e..c191eba65 100644
--- a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="accounts"
+            id="title-accounts"
           >
             <svg
               aria-hidden="true"
@@ -1323,7 +1323,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="accounts"
+            id="title-accounts"
           >
             <svg
               aria-hidden="true"
@@ -2590,7 +2590,7 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="accounts"
+            id="title-accounts"
           >
             <svg
               aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index 4b37af3ef..8eb13d0b8 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="filters"
+            id="title-filters"
           >
             <svg
               aria-hidden="true"
@@ -100,32 +100,51 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-user-types"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-user-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-feed-person"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                User Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="user-type"
+                aria-label="tooltip-user-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-user-type"
+                id="tooltip-user-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-feed-person"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -136,42 +155,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  User Type
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-user-types"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-user-types"
-            id="tooltip-filter-user-types"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -290,32 +280,51 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-user-handles"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-handles"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mention"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Handles
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="handles"
+                aria-label="tooltip-handles"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-handles"
+                id="tooltip-handles"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-mention"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -326,42 +335,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Handles
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-handles"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-handles"
-            id="tooltip-filter-handles"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -514,32 +494,51 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-organizations"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-organizations"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-organization"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.75 16A1.75 1.75 0 0 1 0 14.25V1.75C0 .784.784 0 1.75 0h8.5C11.216 0 12 .784 12 1.75v12.5c0 .085-.006.168-.018.25h2.268a.25.25 0 0 0 .25-.25V8.285a.25.25 0 0 0-.111-.208l-1.055-.703a.749.749 0 1 1 .832-1.248l1.055.703c.487.325.779.871.779 1.456v5.965A1.75 1.75 0 0 1 14.25 16h-3.5a.766.766 0 0 1-.197-.026c-.099.017-.2.026-.303.026h-3a.75.75 0 0 1-.75-.75V14h-1v1.25a.75.75 0 0 1-.75.75Zm-.25-1.75c0 .138.112.25.25.25H4v-1.25a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 .75.75v1.25h2.25a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25ZM3.75 6h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 3.75A.75.75 0 0 1 3.75 3h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 3.75Zm4 3A.75.75 0 0 1 7.75 6h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 7 6.75ZM7.75 3h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 9.75A.75.75 0 0 1 3.75 9h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 9.75ZM7.75 9h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Organizations
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="organizations"
+                aria-label="tooltip-organizations"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-organizations"
+                id="tooltip-organizations"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-organization"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -550,42 +549,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M1.75 16A1.75 1.75 0 0 1 0 14.25V1.75C0 .784.784 0 1.75 0h8.5C11.216 0 12 .784 12 1.75v12.5c0 .085-.006.168-.018.25h2.268a.25.25 0 0 0 .25-.25V8.285a.25.25 0 0 0-.111-.208l-1.055-.703a.749.749 0 1 1 .832-1.248l1.055.703c.487.325.779.871.779 1.456v5.965A1.75 1.75 0 0 1 14.25 16h-3.5a.766.766 0 0 1-.197-.026c-.099.017-.2.026-.303.026h-3a.75.75 0 0 1-.75-.75V14h-1v1.25a.75.75 0 0 1-.75.75Zm-.25-1.75c0 .138.112.25.25.25H4v-1.25a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 .75.75v1.25h2.25a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25ZM3.75 6h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 3.75A.75.75 0 0 1 3.75 3h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 3.75Zm4 3A.75.75 0 0 1 7.75 6h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 7 6.75ZM7.75 3h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 9.75A.75.75 0 0 1 3.75 9h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 9.75ZM7.75 9h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Organizations
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-organizations"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-organizations"
-            id="tooltip-filter-organizations"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -738,32 +708,51 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-subject-type"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="type"
+                aria-label="tooltip-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-type"
+                id="tooltip-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -774,42 +763,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Type
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-subject-type"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-subject-type"
-            id="tooltip-filter-subject-type"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -1094,32 +1054,54 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-state"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-state"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                State
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="state"
+                aria-label="tooltip-state"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-state"
+                id="tooltip-state"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-issue-opened"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1130,45 +1112,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                  />
-                  <path
-                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  State
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-state"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-state"
-            id="tooltip-filter-state"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -1387,32 +1337,51 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-reasons"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-reason"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-note"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Reason
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="reason"
+                aria-label="tooltip-reason"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-reason"
+                id="tooltip-reason"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-note"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1423,42 +1392,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Reason
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-reasons"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-reasons"
-            id="tooltip-filter-reasons"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 083be6e9c..d64718307 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -60,7 +60,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
-                  id="login-with oauth app"
+                  id="title-login-with oauth app"
                 >
                   <svg
                     aria-hidden="true"
@@ -535,7 +535,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="login-with oauth app"
+                id="title-login-with oauth app"
               >
                 <svg
                   aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 375a22b2a..cb2e945a2 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -60,7 +60,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
-                  id="login-with personal access token"
+                  id="title-login-with personal access token"
                 >
                   <svg
                     aria-hidden="true"
@@ -512,7 +512,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="login-with personal access token"
+                id="title-login-with personal access token"
               >
                 <svg
                   aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 709f83aa3..9807cd2b1 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="settings"
+            id="title-settings"
           >
             <svg
               aria-hidden="true"
@@ -110,7 +110,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="appearance"
+              id="title-appearance"
             >
               <svg
                 aria-hidden="true"
@@ -481,7 +481,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="notifications"
+              id="title-notifications"
             >
               <svg
                 aria-hidden="true"
@@ -975,7 +975,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="system"
+              id="title-system"
             >
               <svg
                 aria-hidden="true"