diff --git a/js/apps/admin-ui/public/locales/en/translation.json b/js/apps/admin-ui/public/locales/en/translation.json
index 0db46e2e63..9335f5da43 100644
--- a/js/apps/admin-ui/public/locales/en/translation.json
+++ b/js/apps/admin-ui/public/locales/en/translation.json
@@ -1149,6 +1149,8 @@
   "searchType.attribute": "Attribute search",
   "selectAttribute": "Select attribute",
   "selectAttributes": "Select attributes",
+  "searchAttributes": "Search attributes",
+  "addToFilter": "Add to filter",
   "searchUserByAttributeMissingKeyError": "Specify a attribute key",
   "searchUserByAttributeKeyAlreadyInUseError": "Attribute key already in use",
   "searchUserByAttributeMissingValueError": "Specify a attribute value",
diff --git a/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx b/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
index 2046ebcf0c..3c9329e213 100644
--- a/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
+++ b/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
@@ -186,20 +186,21 @@ export function UserDataTableAttributeSearchForm({
   return (
     <Form className="user-attribute-search-form">
       <TextContent className="user-attribute-search-form-headline">
-        <Text component={TextVariants.h6}>{t("selectAttributes")}</Text>
+        <Text component={TextVariants.h2}>{t("selectAttributes")}</Text>
       </TextContent>
       <Alert
         isInline
         className="user-attribute-search-form-alert"
         variant="info"
         title={t("searchUserByAttributeDescription")}
+        component="h3"
       />
       <TextContent className="user-attribute-search-form-key-value">
         <div className="user-attribute-search-form-left">
-          <Text component={TextVariants.h6}>{t("key")}</Text>
+          <Text component={TextVariants.h3}>{t("key")}</Text>
         </div>
         <div className="user-attribute-search-form-right">
-          <Text component={TextVariants.h6}>{t("value")}</Text>
+          <Text component={TextVariants.h3}>{t("value")}</Text>
         </div>
       </TextContent>
       <div className="user-attribute-search-form-left">
@@ -226,6 +227,7 @@ export function UserDataTableAttributeSearchForm({
             variant="control"
             icon={<CheckIcon />}
             onClick={addToFilter}
+            aria-label={t("addToFilter")}
           />
         </InputGroup>
       </div>
diff --git a/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx b/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
index 217d5e91a8..960954f30e 100644
--- a/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
+++ b/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
@@ -146,6 +146,7 @@ export function UserDataTableToolbarItems({
           icon={<ArrowRightIcon />}
           variant="control"
           onClick={searchUserWithAttributes}
+          aria-label={t("searchAttributes")}
         />
       </>
     );