diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
index 937e5f0ddfc..819608c4fb1 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
@@ -140,89 +140,88 @@ export class SharedPreferences extends PureComponent<Props, State> {
       <Form onSubmit={this.onSubmitForm}>
         {() => {
           return (
-            <FieldSet label={<Trans i18nKey="shared-preferences.title">Preferences</Trans>} disabled={disabled}>
-              <Field label={t('shared-preferences.fields.theme-label', 'Interface theme')}>
-                <Select
-                  options={this.themeOptions}
-                  value={currentThemeOption}
-                  onChange={this.onThemeChanged}
-                  inputId="shared-preferences-theme-select"
-                />
-              </Field>
+            <>
+              <FieldSet label={<Trans i18nKey="shared-preferences.title">Preferences</Trans>} disabled={disabled}>
+                <Field label={t('shared-preferences.fields.theme-label', 'Interface theme')}>
+                  <Select
+                    options={this.themeOptions}
+                    value={currentThemeOption}
+                    onChange={this.onThemeChanged}
+                    inputId="shared-preferences-theme-select"
+                  />
+                </Field>
 
-              <Field
-                label={
-                  <Label htmlFor="home-dashboard-select">
-                    <span className={styles.labelText}>
-                      <Trans i18nKey="shared-preferences.fields.home-dashboard-label">Home Dashboard</Trans>
-                    </span>
-                  </Label>
-                }
-                data-testid="User preferences home dashboard drop down"
-              >
-                <DashboardPicker
-                  value={homeDashboardUID}
-                  onChange={(v) => this.onHomeDashboardChanged(v?.uid ?? '')}
-                  defaultOptions={true}
-                  isClearable={true}
-                  placeholder={t('shared-preferences.fields.home-dashboard-placeholder', 'Default dashboard')}
-                  inputId="home-dashboard-select"
-                />
-              </Field>
-
-              <Field
-                label={t('shared-dashboard.fields.timezone-label', 'Timezone')}
-                data-testid={selectors.components.TimeZonePicker.containerV2}
-              >
-                <TimeZonePicker
-                  includeInternal={true}
-                  value={timezone}
-                  onChange={this.onTimeZoneChanged}
-                  inputId="shared-preferences-timezone-picker"
-                />
-              </Field>
-
-              <Field
-                label={t('shared-preferences.fields.week-start-label', 'Week start')}
-                data-testid={selectors.components.WeekStartPicker.containerV2}
-              >
-                <WeekStartPicker
-                  value={weekStart || ''}
-                  onChange={this.onWeekStartChanged}
-                  inputId={'shared-preferences-week-start-picker'}
-                />
-              </Field>
-
-              <Field
-                label={
-                  <Label htmlFor="locale-select">
-                    <span className={styles.labelText}>
-                      <Trans i18nKey="shared-preferences.fields.locale-label">Language</Trans>
-                    </span>
-                    <FeatureBadge featureState={FeatureState.beta} />
-                  </Label>
-                }
-                data-testid="User preferences language drop down"
-              >
-                <Select
-                  value={languages.find((lang) => lang.value === language)}
-                  onChange={(lang: SelectableValue<string>) => this.onLanguageChanged(lang.value ?? '')}
-                  options={languages}
-                  placeholder={t('shared-preferences.fields.locale-placeholder', 'Choose language')}
-                  inputId="locale-select"
-                />
-              </Field>
-
-              <div className="gf-form-button-row">
-                <Button
-                  type="submit"
-                  variant="primary"
-                  data-testid={selectors.components.UserProfile.preferencesSaveButton}
+                <Field
+                  label={
+                    <Label htmlFor="home-dashboard-select">
+                      <span className={styles.labelText}>
+                        <Trans i18nKey="shared-preferences.fields.home-dashboard-label">Home Dashboard</Trans>
+                      </span>
+                    </Label>
+                  }
+                  data-testid="User preferences home dashboard drop down"
                 >
-                  <Trans i18nKey="common.save">Save</Trans>
-                </Button>
-              </div>
-            </FieldSet>
+                  <DashboardPicker
+                    value={homeDashboardUID}
+                    onChange={(v) => this.onHomeDashboardChanged(v?.uid ?? '')}
+                    defaultOptions={true}
+                    isClearable={true}
+                    placeholder={t('shared-preferences.fields.home-dashboard-placeholder', 'Default dashboard')}
+                    inputId="home-dashboard-select"
+                  />
+                </Field>
+
+                <Field
+                  label={t('shared-dashboard.fields.timezone-label', 'Timezone')}
+                  data-testid={selectors.components.TimeZonePicker.containerV2}
+                >
+                  <TimeZonePicker
+                    includeInternal={true}
+                    value={timezone}
+                    onChange={this.onTimeZoneChanged}
+                    inputId="shared-preferences-timezone-picker"
+                  />
+                </Field>
+
+                <Field
+                  label={t('shared-preferences.fields.week-start-label', 'Week start')}
+                  data-testid={selectors.components.WeekStartPicker.containerV2}
+                >
+                  <WeekStartPicker
+                    value={weekStart || ''}
+                    onChange={this.onWeekStartChanged}
+                    inputId={'shared-preferences-week-start-picker'}
+                  />
+                </Field>
+
+                <Field
+                  label={
+                    <Label htmlFor="locale-select">
+                      <span className={styles.labelText}>
+                        <Trans i18nKey="shared-preferences.fields.locale-label">Language</Trans>
+                      </span>
+                      <FeatureBadge featureState={FeatureState.beta} />
+                    </Label>
+                  }
+                  data-testid="User preferences language drop down"
+                >
+                  <Select
+                    value={languages.find((lang) => lang.value === language)}
+                    onChange={(lang: SelectableValue<string>) => this.onLanguageChanged(lang.value ?? '')}
+                    options={languages}
+                    placeholder={t('shared-preferences.fields.locale-placeholder', 'Choose language')}
+                    inputId="locale-select"
+                  />
+                </Field>
+              </FieldSet>
+              <Button
+                type="submit"
+                variant="primary"
+                data-testid={selectors.components.UserProfile.preferencesSaveButton}
+              >
+                <Trans i18nKey="common.save">Save</Trans>
+              </Button>
+            </>
           );
         }}
       </Form>
diff --git a/public/app/features/admin/UserListAdminPage.tsx b/public/app/features/admin/UserListAdminPage.tsx
index 66fa7929bc0..74ae31c0c59 100644
--- a/public/app/features/admin/UserListAdminPage.tsx
+++ b/public/app/features/admin/UserListAdminPage.tsx
@@ -13,6 +13,7 @@ import {
   Tooltip,
   useStyles2,
   FilterInput,
+  InlineField,
 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
@@ -82,13 +83,15 @@ const UserListAdminPageUnConnected = ({
   return (
     <Page.Contents>
       <div className="page-action-bar" data-testid={selectors.container}>
-        <div className="gf-form gf-form--grow">
-          <FilterInput
-            placeholder="Search user by login, email, or name."
-            autoFocus={true}
-            value={query}
-            onChange={changeQuery}
-          />
+        <>
+          <InlineField grow>
+            <FilterInput
+              placeholder="Search user by login, email, or name."
+              autoFocus={true}
+              value={query}
+              onChange={changeQuery}
+            />
+          </InlineField>
           <RadioButtonGroup
             options={[
               { label: 'All users', value: false },
@@ -101,7 +104,7 @@ const UserListAdminPageUnConnected = ({
           {extraFilters.map((FilterComponent, index) => (
             <FilterComponent key={index} filters={filters} onChange={changeFilter} className={styles.filter} />
           ))}
-        </div>
+        </>
         {contextSrv.hasPermission(AccessControlAction.UsersCreate) && (
           <LinkButton href="admin/users/create" variant="primary">
             New user
diff --git a/public/app/features/profile/UserProfileEditForm.tsx b/public/app/features/profile/UserProfileEditForm.tsx
index bfc25f02359..371a0a0f578 100644
--- a/public/app/features/profile/UserProfileEditForm.tsx
+++ b/public/app/features/profile/UserProfileEditForm.tsx
@@ -31,58 +31,57 @@ export const UserProfileEditForm = ({ user, isSavingUser, updateProfile }: Props
     <Form onSubmit={onSubmitProfileUpdate} validateOn="onBlur">
       {({ register, errors }) => {
         return (
-          <FieldSet>
-            <Field
-              label={t('user-profile.fields.name-label', 'Name') + lockMessage}
-              invalid={!!errors.name}
-              error={<Trans i18nKey="user-profile.fields.name-error">Name is required</Trans>}
-              disabled={disabledEdit}
-            >
-              <Input
-                {...register('name', { required: true })}
-                id="edit-user-profile-name"
-                placeholder={t('user-profile.fields.name-label', 'Name')}
-                defaultValue={user?.name ?? ''}
-                suffix={<InputSuffix />}
-              />
-            </Field>
-
-            <Field
-              label={t('user-profile.fields.email-label', 'Email') + lockMessage}
-              invalid={!!errors.email}
-              error={<Trans i18nKey="user-profile.fields.email-error">Email is required</Trans>}
-              disabled={disabledEdit}
-            >
-              <Input
-                {...register('email', { required: true })}
-                id="edit-user-profile-email"
-                placeholder={t('user-profile.fields.email-label', 'Email')}
-                defaultValue={user?.email ?? ''}
-                suffix={<InputSuffix />}
-              />
-            </Field>
-
-            <Field label={t('user-profile.fields.username-label', 'Username') + lockMessage} disabled={disabledEdit}>
-              <Input
-                {...register('login')}
-                id="edit-user-profile-username"
-                defaultValue={user?.login ?? ''}
-                placeholder={t('user-profile.fields.username-label', 'Username') + lockMessage}
-                suffix={<InputSuffix />}
-              />
-            </Field>
-
-            <div className="gf-form-button-row">
-              <Button
-                variant="primary"
-                disabled={isSavingUser || disabledEdit}
-                data-testid={selectors.components.UserProfile.profileSaveButton}
-                type="submit"
+          <>
+            <FieldSet>
+              <Field
+                label={t('user-profile.fields.name-label', 'Name') + lockMessage}
+                invalid={!!errors.name}
+                error={<Trans i18nKey="user-profile.fields.name-error">Name is required</Trans>}
+                disabled={disabledEdit}
               >
-                <Trans i18nKey="common.save">Save</Trans>
-              </Button>
-            </div>
-          </FieldSet>
+                <Input
+                  {...register('name', { required: true })}
+                  id="edit-user-profile-name"
+                  placeholder={t('user-profile.fields.name-label', 'Name')}
+                  defaultValue={user?.name ?? ''}
+                  suffix={<InputSuffix />}
+                />
+              </Field>
+
+              <Field
+                label={t('user-profile.fields.email-label', 'Email') + lockMessage}
+                invalid={!!errors.email}
+                error={<Trans i18nKey="user-profile.fields.email-error">Email is required</Trans>}
+                disabled={disabledEdit}
+              >
+                <Input
+                  {...register('email', { required: true })}
+                  id="edit-user-profile-email"
+                  placeholder={t('user-profile.fields.email-label', 'Email')}
+                  defaultValue={user?.email ?? ''}
+                  suffix={<InputSuffix />}
+                />
+              </Field>
+
+              <Field label={t('user-profile.fields.username-label', 'Username') + lockMessage} disabled={disabledEdit}>
+                <Input
+                  {...register('login')}
+                  id="edit-user-profile-username"
+                  defaultValue={user?.login ?? ''}
+                  placeholder={t('user-profile.fields.username-label', 'Username') + lockMessage}
+                  suffix={<InputSuffix />}
+                />
+              </Field>
+            </FieldSet>
+            <Button
+              variant="primary"
+              disabled={isSavingUser || disabledEdit}
+              data-testid={selectors.components.UserProfile.profileSaveButton}
+              type="submit"
+            >
+              <Trans i18nKey="common.save">Save</Trans>
+            </Button>
+          </>
         );
       }}
     </Form>
diff --git a/public/app/features/teams/CreateTeam.tsx b/public/app/features/teams/CreateTeam.tsx
index deb3330c70a..5136e92abf0 100644
--- a/public/app/features/teams/CreateTeam.tsx
+++ b/public/app/features/teams/CreateTeam.tsx
@@ -46,35 +46,36 @@ export const CreateTeam = (): JSX.Element => {
       <Page.Contents>
         <Form onSubmit={createTeam}>
           {({ register, errors }) => (
-            <FieldSet>
-              <Field label="Name" required invalid={!!errors.name} error="Team name is required">
-                <Input {...register('name', { required: true })} id="team-name" />
-              </Field>
-              {contextSrv.licensedAccessControlEnabled() && (
-                <Field label="Role">
-                  <TeamRolePicker
-                    teamId={0}
-                    roleOptions={roleOptions}
-                    disabled={false}
-                    apply={true}
-                    onApplyRoles={setPendingRoles}
-                    pendingRoles={pendingRoles}
-                    maxWidth="100%"
-                  />
+            <>
+              <FieldSet>
+                <Field label="Name" required invalid={!!errors.name} error="Team name is required">
+                  <Input {...register('name', { required: true })} id="team-name" />
                 </Field>
-              )}
-              <Field
-                label={'Email'}
-                description={'This is optional and is primarily used for allowing custom team avatars.'}
-              >
-                <Input {...register('email')} type="email" id="team-email" placeholder="email@test.com" />
-              </Field>
-              <div className="gf-form-button-row">
-                <Button type="submit" variant="primary">
-                  Create
-                </Button>
-              </div>
-            </FieldSet>
+                {contextSrv.licensedAccessControlEnabled() && (
+                  <Field label="Role">
+                    <TeamRolePicker
+                      teamId={0}
+                      roleOptions={roleOptions}
+                      disabled={false}
+                      apply={true}
+                      onApplyRoles={setPendingRoles}
+                      pendingRoles={pendingRoles}
+                      maxWidth="100%"
+                    />
+                  </Field>
+                )}
+                <Field
+                  label={'Email'}
+                  description={'This is optional and is primarily used for allowing custom team avatars.'}
+                >
+                  <Input {...register('email')} type="email" id="team-email" placeholder="email@test.com" />
+                </Field>
+              </FieldSet>
+
+              <Button type="submit" variant="primary">
+                Create
+              </Button>
+            </>
           )}
         </Form>
       </Page.Contents>