diff --git a/src/clients/ClientSettings.tsx b/src/clients/ClientSettings.tsx
index d0f43e695d..7da0cb38a2 100644
--- a/src/clients/ClientSettings.tsx
+++ b/src/clients/ClientSettings.tsx
@@ -78,13 +78,12 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
               <HelpItem
                 helpText="clients-help:validRedirectURIs"
                 forLabel={t("validRedirectUri")}
-                forID={t(`common:helpLabel`, { label: t("validRedirectUri") })}
+                forID="kc-redirect"
               />
             }
           >
             <MultiLineInput
               name="redirectUris"
-              aria-label={t("validRedirectUri")}
               addButtonLabel="clients:addRedirectUri"
             />
           </FormGroup>
@@ -95,7 +94,7 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
               <HelpItem
                 helpText="clients-help:homeURL"
                 forLabel={t("homeURL")}
-                forID={t(`common:helpLabel`, { label: t("homeURL") })}
+                forID="kc-home-url"
               />
             }
           >
@@ -113,13 +112,12 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
               <HelpItem
                 helpText="clients-help:webOrigins"
                 forLabel={t("webOrigins")}
-                forID={t(`common:helpLabel`, { label: t("webOrigins") })}
+                forID="kc-web-origins"
               />
             }
           >
             <MultiLineInput
               name="webOrigins"
-              aria-label={t("webOrigins")}
               addButtonLabel="clients:addWebOrigins"
             />
           </FormGroup>
@@ -199,7 +197,7 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
               control={control}
               render={({ onChange, value }) => (
                 <Switch
-                  id="kc-consent-switch"
+                  id="kc-consent"
                   label={t("common:on")}
                   labelOff={t("common:off")}
                   isChecked={value}
@@ -219,7 +217,7 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
               control={control}
               render={({ onChange, value }) => (
                 <Switch
-                  id="kc-display-on-client-switch"
+                  id="kc-display-on-client"
                   label={t("common:on")}
                   labelOff={t("common:off")}
                   isChecked={value === "true"}
diff --git a/src/clients/add/CapabilityConfig.tsx b/src/clients/add/CapabilityConfig.tsx
index 10816fd099..63f95259dd 100644
--- a/src/clients/add/CapabilityConfig.tsx
+++ b/src/clients/add/CapabilityConfig.tsx
@@ -49,7 +49,7 @@ export const CapabilityConfig = ({
                 <HelpItem
                   helpText="clients-help:authentication"
                   forLabel={t("authentication")}
-                  forID={t(`common:helpLabel`, { label: t("authentication") })}
+                  forID="kc-authentication"
                 />
               }
             >
@@ -60,7 +60,7 @@ export const CapabilityConfig = ({
                 render={({ onChange, value }) => (
                   <Switch
                     data-testid="authentication"
-                    id="kc-authentication-switch"
+                    id="kc-authentication"
                     name="publicClient"
                     label={t("common:on")}
                     labelOff={t("common:off")}
@@ -84,7 +84,7 @@ export const CapabilityConfig = ({
                 <HelpItem
                   helpText="clients-help:authorization"
                   forLabel={t("authorization")}
-                  forID={t(`common:helpLabel`, { label: t("authorization") })}
+                  forID="kc-authorization"
                 />
               }
             >
@@ -95,7 +95,7 @@ export const CapabilityConfig = ({
                 render={({ onChange, value }) => (
                   <Switch
                     data-testid="authorization"
-                    id="kc-authorization-switch"
+                    id="kc-authorization"
                     name="authorizationServicesEnabled"
                     label={t("common:on")}
                     labelOff={t("common:off")}
@@ -135,9 +135,7 @@ export const CapabilityConfig = ({
                         <HelpItem
                           helpText="clients-help:standardFlow"
                           forLabel={t("standardFlow")}
-                          forID={t(`common:helpLabel`, {
-                            label: t("standardFlow"),
-                          })}
+                          forID="kc-flow-standard"
                         />
                       </InputGroup>
                     )}
@@ -161,9 +159,7 @@ export const CapabilityConfig = ({
                         <HelpItem
                           helpText="clients-help:directAccess"
                           forLabel={t("directAccess")}
-                          forID={t(`common:helpLabel`, {
-                            label: t("directAccess"),
-                          })}
+                          forID="kc-flow-direct"
                         />
                       </InputGroup>
                     )}
@@ -187,9 +183,7 @@ export const CapabilityConfig = ({
                         <HelpItem
                           helpText="clients-help:implicitFlow"
                           forLabel={t("implicitFlow")}
-                          forID={t(`common:helpLabel`, {
-                            label: t("implicitFlow"),
-                          })}
+                          forID="kc-flow-implicit"
                         />
                       </InputGroup>
                     )}
@@ -219,9 +213,7 @@ export const CapabilityConfig = ({
                         <HelpItem
                           helpText="clients-help:serviceAccount"
                           forLabel={t("serviceAccount")}
-                          forID={t(`common:helpLabel`, {
-                            label: t("serviceAccount"),
-                          })}
+                          forID="kc-flow-service-account"
                         />
                       </InputGroup>
                     )}
@@ -240,9 +232,7 @@ export const CapabilityConfig = ({
                 <HelpItem
                   helpText="clients-help:encryptAssertions"
                   forLabel={t("encryptAssertions")}
-                  forID={t(`common:helpLabel`, {
-                    label: t("encryptAssertions"),
-                  })}
+                  forID="kc-encrypt"
                 />
               }
               label={t("encryptAssertions")}
@@ -270,7 +260,7 @@ export const CapabilityConfig = ({
                 <HelpItem
                   helpText="clients-help:clientSignature"
                   forLabel={t("clientSignature")}
-                  forID={t(`common:helpLabel`, { label: t("clientSignature") })}
+                  forID="kc-client-signature"
                 />
               }
               label={t("clientSignature")}
diff --git a/src/clients/add/GeneralSettings.tsx b/src/clients/add/GeneralSettings.tsx
index 913fd92d33..d2fcca0c66 100644
--- a/src/clients/add/GeneralSettings.tsx
+++ b/src/clients/add/GeneralSettings.tsx
@@ -30,7 +30,7 @@ export const GeneralSettings = () => {
           <HelpItem
             helpText="clients-help:clientType"
             forLabel={t("clientType")}
-            forID={t(`common:helpLabel`, { label: t("clientType") })}
+            forID="kc-type"
           />
         }
       >
diff --git a/src/components/list-empty-state/ListEmptyState.tsx b/src/components/list-empty-state/ListEmptyState.tsx
index d13337813f..40d60a5704 100644
--- a/src/components/list-empty-state/ListEmptyState.tsx
+++ b/src/components/list-empty-state/ListEmptyState.tsx
@@ -47,7 +47,7 @@ export const ListEmptyState = ({
         ) : (
           hasIcon && <EmptyStateIcon icon={icon ? icon : PlusCircleIcon} />
         )}
-        <Title headingLevel="h1" size="lg">
+        <Title headingLevel="h4" size="lg">
           {message}
         </Title>
         <EmptyStateBody>{instructions}</EmptyStateBody>
diff --git a/src/components/multi-line-input/MultiLineInput.tsx b/src/components/multi-line-input/MultiLineInput.tsx
index bfb81d9ce8..af45798957 100644
--- a/src/components/multi-line-input/MultiLineInput.tsx
+++ b/src/components/multi-line-input/MultiLineInput.tsx
@@ -64,7 +64,6 @@ export const MultiLineInput = ({
               variant={ButtonVariant.link}
               onClick={() => remove(index)}
               tabIndex={-1}
-              aria-label={t("common:remove")}
               isDisabled={index === fields.length - 1}
             >
               <MinusCircleIcon />
@@ -75,7 +74,6 @@ export const MultiLineInput = ({
               variant={ButtonVariant.link}
               onClick={() => append({})}
               tabIndex={-1}
-              aria-label={t("common:add")}
               isDisabled={
                 rest.isDisabled ||
                 !(currentValues && currentValues[index]?.value)
diff --git a/src/components/scroll-form/ScrollPanel.tsx b/src/components/scroll-form/ScrollPanel.tsx
index 81e26f3a35..5bf141b4e6 100644
--- a/src/components/scroll-form/ScrollPanel.tsx
+++ b/src/components/scroll-form/ScrollPanel.tsx
@@ -14,7 +14,7 @@ export const ScrollPanel = (props: ScrollPanelProps) => {
   return (
     <section {...rest} className="kc-form-panel__panel">
       <Title
-        headingLevel="h1"
+        headingLevel="h4"
         size="xl"
         className="kc-form-panel__title"
         id={scrollId}
diff --git a/src/dashboard/Dashboard.tsx b/src/dashboard/Dashboard.tsx
index f4d23d87f5..5c5e722d10 100644
--- a/src/dashboard/Dashboard.tsx
+++ b/src/dashboard/Dashboard.tsx
@@ -114,9 +114,7 @@ const Dashboard = () => {
                     <DescriptionListTerm>
                       {t("enabledFeatures")}{" "}
                       <HelpItem
-                        forID={t(`common:helpLabel`, {
-                          label: t("enabledFeatures"),
-                        })}
+                        forID="enabledFeatures"
                         forLabel={t("enabledFeatures")}
                         helpText="dashboard:infoEnabledFeatures"
                       />
@@ -145,9 +143,7 @@ const Dashboard = () => {
                     <DescriptionListTerm>
                       {t("disabledFeatures")}{" "}
                       <HelpItem
-                        forID={t(`common:helpLabel`, {
-                          label: t("disabledFeatures"),
-                        })}
+                        forID="disabledFeatures"
                         forLabel={t("disabledFeatures")}
                         helpText="dashboard:infoDisabledFeatures"
                       />