diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index fb7c06e6e90d8..739cca0722fc0 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -81,7 +81,7 @@ export class Server {
   private readonly i18n: I18nService;
 
   private readonly savedObjectsStartPromise: Promise<SavedObjectsServiceStart>;
-  private savedObjectsStartPromiseResolver!: (value: SavedObjectsServiceStart) => void;
+  private resolveSavedObjectsStartPromise!: (value: SavedObjectsServiceStart) => void;
 
   #pluginsInitialized?: boolean;
   private coreStart?: InternalCoreStart;
@@ -117,7 +117,7 @@ export class Server {
     this.i18n = new I18nService(core);
 
     this.savedObjectsStartPromise = new Promise((resolve) => {
-      this.savedObjectsStartPromiseResolver = resolve;
+      this.resolveSavedObjectsStartPromise = resolve;
     });
   }
 
@@ -253,7 +253,7 @@ export class Server {
       elasticsearch: elasticsearchStart,
       pluginsInitialized: this.#pluginsInitialized,
     });
-    await this.savedObjectsStartPromiseResolver(savedObjectsStart);
+    await this.resolveSavedObjectsStartPromise(savedObjectsStart);
 
     soStartSpan?.end();
     const capabilitiesStart = this.capabilities.start();
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
index 19a45d80f738d..21c5912ea49a1 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
@@ -570,11 +570,17 @@ exports[`Flyout should render import step 1`] = `
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         label={
-          <FormattedMessage
-            defaultMessage="Select a file to import"
-            id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
-            values={Object {}}
-          />
+          <EuiTitle
+            size="xs"
+          >
+            <span>
+              <FormattedMessage
+                defaultMessage="Select a file to import"
+                id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
+                values={Object {}}
+              />
+            </span>
+          </EuiTitle>
         }
         labelType="label"
       >
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index 147b5ea5ed21c..c5b66c55091ad 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -758,10 +758,14 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
         <EuiFormRow
           fullWidth
           label={
-            <FormattedMessage
-              id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
-              defaultMessage="Select a file to import"
-            />
+            <EuiTitle size="xs">
+              <span>
+                <FormattedMessage
+                  id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
+                  defaultMessage="Select a file to import"
+                />
+              </span>
+            </EuiTitle>
           }
         >
           <EuiFilePicker
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx
index 6177559460f3c..4ff9c1340d603 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx
@@ -140,6 +140,15 @@ export const ImportModeControl = ({
       }}
       data-test-subj="savedObjectsManagement-importModeControl"
     >
+      <EuiCheckableCard
+        id={createNewCopiesEnabled.id}
+        label={createLabel(createNewCopiesEnabled)}
+        checked={createNewCopies}
+        onChange={() => onChange({ createNewCopies: true })}
+      />
+
+      <EuiSpacer size="s" />
+
       <EuiCheckableCard
         id={createNewCopiesDisabled.id}
         label={createLabel(createNewCopiesDisabled)}
@@ -148,15 +157,6 @@ export const ImportModeControl = ({
       >
         {overwriteRadio}
       </EuiCheckableCard>
-
-      <EuiSpacer size="s" />
-
-      <EuiCheckableCard
-        id={createNewCopiesEnabled.id}
-        label={createLabel(createNewCopiesEnabled)}
-        checked={createNewCopies}
-        onChange={() => onChange({ createNewCopies: true })}
-      />
     </EuiFormFieldset>
   );
 };
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx
index c3e631e335ea7..f060f7e34e230 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx
@@ -126,6 +126,15 @@ export const CopyModeControl = ({ initialValues, updateSelection }: CopyModeCont
           ),
         }}
       >
+        <EuiCheckableCard
+          id={createNewCopiesEnabled.id}
+          label={createLabel(createNewCopiesEnabled)}
+          checked={createNewCopies}
+          onChange={() => onChange({ createNewCopies: true })}
+        />
+
+        <EuiSpacer size="s" />
+
         <EuiCheckableCard
           id={createNewCopiesDisabled.id}
           label={createLabel(createNewCopiesDisabled)}
@@ -140,15 +149,6 @@ export const CopyModeControl = ({ initialValues, updateSelection }: CopyModeCont
             data-test-subj={'cts-copyModeControl-overwriteRadioGroup'}
           />
         </EuiCheckableCard>
-
-        <EuiSpacer size="s" />
-
-        <EuiCheckableCard
-          id={createNewCopiesEnabled.id}
-          label={createLabel(createNewCopiesEnabled)}
-          checked={createNewCopies}
-          onChange={() => onChange({ createNewCopies: true })}
-        />
       </EuiFormFieldset>
 
       <EuiSpacer size="m" />
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
index 551573feebcdb..9c38b747ba074 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { EuiSpacer, EuiFormRow } from '@elastic/eui';
+import { EuiSpacer, EuiTitle, EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { CopyOptions } from '../types';
 import { SavedObjectsManagementRecord } from '../../../../../../src/plugins/saved_objects_management/public';
@@ -45,14 +45,18 @@ export const CopyToSpaceForm = (props: Props) => {
         updateSelection={(newValues: CopyMode) => changeCopyMode(newValues)}
       />
 
-      <EuiSpacer />
+      <EuiSpacer size="m" />
 
       <EuiFormRow
         label={
-          <FormattedMessage
-            id="xpack.spaces.management.copyToSpace.selectSpacesLabel"
-            defaultMessage="Select spaces"
-          />
+          <EuiTitle size="xs">
+            <span>
+              <FormattedMessage
+                id="xpack.spaces.management.copyToSpace.selectSpacesLabel"
+                defaultMessage="Select spaces"
+              />
+            </span>
+          </EuiTitle>
         }
         fullWidth
       >
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
index d4e12b31b5b4f..bfd25ba4de0bb 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -72,7 +72,7 @@ export const SelectableSpacesControl = (props: Props) => {
         className: 'spcCopyToSpace__spacesList',
         'data-test-subj': 'cts-form-space-selector',
       }}
-      searchable
+      searchable={options.length > 6}
     >
       {(list, search) => {
         return (
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
index e53cc152442a2..f6d1576b5067f 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -175,7 +175,7 @@ export const SelectableSpacesControl = (props: Props) => {
             'data-test-subj': 'sts-form-space-selector',
           }}
           height={ROW_HEIGHT * 3.5}
-          searchable
+          searchable={options.length > 6}
         >
           {(list, search) => {
             return (
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
index bc196208ab35c..75e40b85a37dd 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
@@ -38,7 +38,7 @@ export const ShareToSpaceForm = (props: Props) => {
           title={
             <FormattedMessage
               id="xpack.spaces.management.shareToSpace.shareWarningTitle"
-              defaultMessage="Editing a shared object applies the changes in all spaces"
+              defaultMessage="Editing a shared object applies the changes in every space"
             />
           }
           color="warning"