diff --git a/public/pages/Aliases/containers/AliasActions/index.tsx b/public/pages/Aliases/containers/AliasActions/index.tsx
index 0b467d78e..9601e856b 100644
--- a/public/pages/Aliases/containers/AliasActions/index.tsx
+++ b/public/pages/Aliases/containers/AliasActions/index.tsx
@@ -54,7 +54,7 @@ export default function AliasesActions(props: AliasesActionsProps) {
     <>
       <SimplePopover
         data-test-subj="moreAction"
-        panelPaddingSize="none"
+        panelPaddingSize="s"
         button={
           <EuiSmallButton iconType="arrowDown" iconSide="right">
             Actions
diff --git a/public/pages/Aliases/containers/CreateAlias/__snapshots__/CreateAlias.test.tsx.snap b/public/pages/Aliases/containers/CreateAlias/__snapshots__/CreateAlias.test.tsx.snap
index 68c15e74f..2103c2ef7 100644
--- a/public/pages/Aliases/containers/CreateAlias/__snapshots__/CreateAlias.test.tsx.snap
+++ b/public/pages/Aliases/containers/CreateAlias/__snapshots__/CreateAlias.test.tsx.snap
@@ -232,7 +232,6 @@ HTMLCollection [
                 <span
                   class="euiButtonContent euiButton__content"
                 >
-                  EuiIconMock
                   <span
                     class="euiButton__text"
                   >
diff --git a/public/pages/Aliases/containers/CreateAlias/index.tsx b/public/pages/Aliases/containers/CreateAlias/index.tsx
index dd50a20bf..a72291886 100644
--- a/public/pages/Aliases/containers/CreateAlias/index.tsx
+++ b/public/pages/Aliases/containers/CreateAlias/index.tsx
@@ -206,7 +206,6 @@ export default function CreateAlias(props: ICreateAliasProps) {
             fill
             color="primary"
             data-test-subj="createAliasButton"
-            iconType={isEdit ? undefined : "plus"}
             onClick={async () => {
               const { errors, values } = (await formGenerateRef.current?.validatePromise()) || {};
               if (errors) {
diff --git a/public/pages/ChangePolicy/containers/ChangePolicy/ChangePolicy.tsx b/public/pages/ChangePolicy/containers/ChangePolicy/ChangePolicy.tsx
index 39eb97664..d07953bec 100644
--- a/public/pages/ChangePolicy/containers/ChangePolicy/ChangePolicy.tsx
+++ b/public/pages/ChangePolicy/containers/ChangePolicy/ChangePolicy.tsx
@@ -190,7 +190,7 @@ export class ChangePolicy extends Component<ChangePolicyProps, ChangePolicyState
 
           <EuiSpacer />
 
-          <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
+          <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
             <EuiFlexItem grow={false}>
               <EuiSmallButtonEmpty onClick={this.onCancel} data-test-subj="changePolicyCancelButton">
                 Cancel
diff --git a/public/pages/ChangePolicy/containers/ChangePolicy/__snapshots__/ChangePolicy.test.tsx.snap b/public/pages/ChangePolicy/containers/ChangePolicy/__snapshots__/ChangePolicy.test.tsx.snap
index 8cba4876d..cc14a9634 100644
--- a/public/pages/ChangePolicy/containers/ChangePolicy/__snapshots__/ChangePolicy.test.tsx.snap
+++ b/public/pages/ChangePolicy/containers/ChangePolicy/__snapshots__/ChangePolicy.test.tsx.snap
@@ -415,7 +415,7 @@ exports[`<ChangePolicy /> spec renders the component 1`] = `
     class="euiSpacer euiSpacer--l"
   />
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
   >
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/public/pages/CreateIndex/containers/IndexForm/index.tsx b/public/pages/CreateIndex/containers/IndexForm/index.tsx
index ebd911e56..b02d9458a 100644
--- a/public/pages/CreateIndex/containers/IndexForm/index.tsx
+++ b/public/pages/CreateIndex/containers/IndexForm/index.tsx
@@ -464,21 +464,14 @@ export class IndexForm extends Component<IndexFormProps & { services: BrowserSer
         {hideButtons ? null : (
           <>
             <EuiSpacer />
-            <EuiSpacer />
-            <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
+            <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
               <EuiFlexItem grow={false}>
                 <EuiSmallButtonEmpty onClick={this.onCancel} data-test-subj="createIndexCancelButton">
                   Cancel
                 </EuiSmallButtonEmpty>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiSmallButton
-                  fill
-                  onClick={this.onSubmit}
-                  isLoading={isSubmitting}
-                  data-test-subj="createIndexCreateButton"
-                  iconType={isEdit ? undefined : "plus"}
-                >
+                <EuiSmallButton fill onClick={this.onSubmit} isLoading={isSubmitting} data-test-subj="createIndexCreateButton">
                   {isEdit ? "Update" : "Create"}
                 </EuiSmallButton>
               </EuiFlexItem>
diff --git a/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx b/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx
index bbe0f4784..e2212afde 100644
--- a/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx
+++ b/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx
@@ -402,33 +402,6 @@ const TemplateDetail = (props: TemplateDetailProps, ref: Ref<FieldInstance>) =>
           <EuiSpacer />
         </>
       ) : null}
-      {/* <EuiPanel>
-        {
-          isEdit && selectedTabId === TABS_ENUM.SUMMARY ? (
-            <EuiText size="s">
-              <h2>Preview template</h2>
-            </EuiText>
-          ) : values._meta?.flow === FLOW_ENUM.COMPONENTS ? (
-            <EuiText size="s">
-              <h2>Override template definition</h2>
-            </EuiText>
-          ) : (
-            <EuiText size="s">
-              <h2>Template definition</h2>
-            </EuiText>
-          )
-        }
-        {
-          (!isEdit || selectedTabId !== TABS_ENUM.SUMMARY) && values._meta?.flow === FLOW_ENUM.COMPONENTS
-            ? <EuiText size="xs">
-                <EuiTextColor color="subdued">Provide additional configurations such as index aliases, settings, and mappings. Configurations defined in this section will take precedent if they overlap with the associated component templates.</EuiTextColor>
-              </EuiText>
-            : undefined
-        }
-        {(!isEdit || selectedTabId !== TABS_ENUM.SUMMARY) && values._meta?.flow === FLOW_ENUM.COMPONENTS
-          ? <EuiAccordion id={htmlIdGenerator()()} forceState={isAccordionOpen} onToggle={toggleAccordion} buttonContent={titleContent}></EuiAccordion> : undefined
-        }
-      </EuiPanel> */}
       <ContentPanel
         title={
           isEdit && selectedTabId === TABS_ENUM.SUMMARY ? (
@@ -503,7 +476,6 @@ const TemplateDetail = (props: TemplateDetailProps, ref: Ref<FieldInstance>) =>
                   }}
                   isLoading={isSubmitting}
                   data-test-subj="CreateIndexTemplateCreateButton"
-                  iconType={"plus"}
                 >
                   Create template
                 </EuiSmallButton>
diff --git a/public/pages/CreateIndexTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap b/public/pages/CreateIndexTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap
index 11270dbc5..c042f03bb 100644
--- a/public/pages/CreateIndexTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap
+++ b/public/pages/CreateIndexTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap
@@ -1262,7 +1262,6 @@ exports[`<TemplateDetail /> spec render component in non-edit-mode 1`] = `
           <span
             class="euiButtonContent euiButton__content"
           >
-            EuiIconMock
             <span
               class="euiButton__text"
             >
diff --git a/public/pages/CreateSnapshotPolicy/components/CronSchedule/CronSchedule.tsx b/public/pages/CreateSnapshotPolicy/components/CronSchedule/CronSchedule.tsx
index 05daa9c4d..bf07afd38 100644
--- a/public/pages/CreateSnapshotPolicy/components/CronSchedule/CronSchedule.tsx
+++ b/public/pages/CreateSnapshotPolicy/components/CronSchedule/CronSchedule.tsx
@@ -120,6 +120,7 @@ const CronSchedule = ({
   let startTimeContent;
   startTimeContent = (
     <EuiDatePicker
+      compressed={true}
       showTimeSelect
       showTimeSelectOnly
       selected={startTime(hour, minute)}
diff --git a/public/pages/Indices/containers/IndicesActions/index.tsx b/public/pages/Indices/containers/IndicesActions/index.tsx
index 3b88e607a..9640af9c3 100644
--- a/public/pages/Indices/containers/IndicesActions/index.tsx
+++ b/public/pages/Indices/containers/IndicesActions/index.tsx
@@ -137,7 +137,7 @@ export default function IndicesActions(props: IndicesActionsProps) {
         {({ onShow }) => (
           <SimplePopover
             data-test-subj="moreAction"
-            panelPaddingSize="none"
+            panelPaddingSize="s"
             button={
               <EuiSmallButton iconType="arrowDown" iconSide="right">
                 Actions
diff --git a/public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.tsx b/public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.tsx
index ad32ccdff..02a694f77 100644
--- a/public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.tsx
+++ b/public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.tsx
@@ -9,21 +9,14 @@ import {
   ArgsWithError,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPagination,
   EuiSearchBar,
   EuiCompressedSwitch,
-  EuiButton,
-  EuiPopover,
-  EuiContextMenuPanel,
   EuiButtonIcon,
   EuiButtonEmpty,
   EuiSpacer,
 } from "@elastic/eui";
 import { DataStream } from "../../../../../server/models/interfaces";
-import { ManagedIndices } from "../../containers/ManagedIndices/ManagedIndices";
-import { ManagedIndexItem } from "plugins/index-management-dashboards-plugin/models/interfaces";
 import { getUISettings } from "../../../../services/Services";
-import { size } from "lodash";
 
 interface ManagedIndexControlsProps {
   search: string;
diff --git a/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx b/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
index a22cb9571..1c52b62e9 100644
--- a/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
+++ b/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
@@ -601,7 +601,7 @@ export class ManagedIndices extends MDSEnabledComponent<ManagedIndicesProps, Man
             isOpen={isPopoverOpen}
             closePopover={this.closePopover}
             anchorPosition="downLeft"
-            panelPaddingSize="none"
+            panelPaddingSize="s"
           >
             <EuiContextMenuPanel items={popoverActionItems} size="s" />
           </EuiPopover>
diff --git a/public/pages/Reindex/container/Reindex/Reindex.tsx b/public/pages/Reindex/container/Reindex/Reindex.tsx
index 1fe900b30..fc9a8e4b5 100644
--- a/public/pages/Reindex/container/Reindex/Reindex.tsx
+++ b/public/pages/Reindex/container/Reindex/Reindex.tsx
@@ -728,7 +728,7 @@ class Reindex extends Component<ReindexProps, ReindexState> {
 
           <EuiSpacer />
 
-          <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
+          <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
             <EuiFlexItem grow={false}>
               <EuiSmallButtonEmpty onClick={this.onCancel} data-test-subj="reindexCancelButton">
                 Cancel
diff --git a/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap b/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap
index cb4858c19..5f6a8f974 100644
--- a/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap
+++ b/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap
@@ -390,7 +390,7 @@ exports[`<Reindex /> spec renders the component 1`] = `
     class="euiSpacer euiSpacer--l"
   />
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
   >
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/public/pages/RollupDetails/containers/RollupDetails/RollupDetails.tsx b/public/pages/RollupDetails/containers/RollupDetails/RollupDetails.tsx
index 3c66ef00f..3be1e4f03 100644
--- a/public/pages/RollupDetails/containers/RollupDetails/RollupDetails.tsx
+++ b/public/pages/RollupDetails/containers/RollupDetails/RollupDetails.tsx
@@ -125,7 +125,6 @@ export class RollupDetails extends Component<RollupDetailsProps, RollupDetailsSt
         ? [BREADCRUMBS.ROLLUPS, { text: id }]
         : [BREADCRUMBS.INDEX_MANAGEMENT, BREADCRUMBS.ROLLUPS, { text: id }];
       this.context.chrome.setBreadcrumbs(newBreadCrumbs);
-      this.props.history.push(`${ROUTES.ROLLUP_DETAILS}?id=${id}`);
       await this.getRollup(id);
       this.forceUpdate();
     } else {
diff --git a/public/pages/ShrinkIndex/container/ShrinkIndex/ShrinkIndex.tsx b/public/pages/ShrinkIndex/container/ShrinkIndex/ShrinkIndex.tsx
index 6a1e68dbd..8f2e846bd 100644
--- a/public/pages/ShrinkIndex/container/ShrinkIndex/ShrinkIndex.tsx
+++ b/public/pages/ShrinkIndex/container/ShrinkIndex/ShrinkIndex.tsx
@@ -705,8 +705,7 @@ class ShrinkIndex extends Component<ShrinkIndexProps, ShrinkIndexState> {
             operationType={OperationType.SHRINK}
           />
           <EuiSpacer />
-          <EuiSpacer />
-          <EuiFlexGroup justifyContent="flexEnd">
+          <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
             <EuiFlexItem grow={false}>
               <EuiSmallButtonEmpty onClick={this.onCancel} flush="left" data-test-subj="shrinkIndexCancelButton">
                 Cancel
diff --git a/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap b/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap
index 2a3c40d49..dfc88fc2e 100644
--- a/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap
+++ b/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap
@@ -842,10 +842,7 @@ exports[`<Shrink index /> spec renders the component 1`] = `
       class="euiSpacer euiSpacer--l"
     />
     <div
-      class="euiSpacer euiSpacer--l"
-    />
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
     >
       <div
         class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx b/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx
index 6682f2a2f..e3709dc68 100644
--- a/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx
+++ b/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx
@@ -273,7 +273,7 @@ export default class SplitIndexForm extends Component<SplitIndexComponentProps>
         />
 
         <EuiSpacer />
-        <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
+        <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
           <EuiFlexItem grow={false}>
             <EuiSmallButtonEmpty onClick={this.props.onCancel} data-test-subj="splitCancelButton">
               Cancel
diff --git a/public/pages/Templates/containers/TemplatesActions/index.tsx b/public/pages/Templates/containers/TemplatesActions/index.tsx
index d92d26094..d35a2e8c5 100644
--- a/public/pages/Templates/containers/TemplatesActions/index.tsx
+++ b/public/pages/Templates/containers/TemplatesActions/index.tsx
@@ -36,7 +36,7 @@ export default function TemplatesActions(props: TemplatesActionsProps) {
     <>
       <SimplePopover
         data-test-subj="moreAction"
-        panelPaddingSize="none"
+        panelPaddingSize="s"
         button={
           <EuiSmallButton iconType="arrowDown" iconSide="right">
             Actions
diff --git a/public/pages/Transforms/containers/Transforms/EditTransform.tsx b/public/pages/Transforms/containers/Transforms/EditTransform.tsx
index 69c8eef88..efb7cf7a2 100644
--- a/public/pages/Transforms/containers/Transforms/EditTransform.tsx
+++ b/public/pages/Transforms/containers/Transforms/EditTransform.tsx
@@ -186,7 +186,7 @@ export class EditTransform extends Component<EditTransformProps, EditTransformSt
 
           <EuiSpacer />
 
-          <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
+          <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
             <EuiFlexItem grow={false}>
               <EuiSmallButtonEmpty onClick={this.onCancel} data-test-subj="editTransformCancelButton">
                 Cancel
diff --git a/public/pages/Transforms/containers/Transforms/TransformDetails.tsx b/public/pages/Transforms/containers/Transforms/TransformDetails.tsx
index 0a9974a61..328cf8bd9 100644
--- a/public/pages/Transforms/containers/Transforms/TransformDetails.tsx
+++ b/public/pages/Transforms/containers/Transforms/TransformDetails.tsx
@@ -114,7 +114,6 @@ export class TransformDetails extends Component<TransformDetailsProps, Transform
         ? [BREADCRUMBS.TRANSFORMS, { text: id }]
         : [BREADCRUMBS.INDEX_MANAGEMENT, BREADCRUMBS.TRANSFORMS, { text: id }];
       this.context.chrome.setBreadcrumbs(breadCrumbsUp);
-      this.props.history.push(`${ROUTES.TRANSFORM_DETAILS}?id=${id}`);
       await this.getTransform(id);
       this.forceUpdate();
     } else {
diff --git a/public/pages/Transforms/containers/Transforms/Transforms.tsx b/public/pages/Transforms/containers/Transforms/Transforms.tsx
index 1b412765e..fc503fffe 100644
--- a/public/pages/Transforms/containers/Transforms/Transforms.tsx
+++ b/public/pages/Transforms/containers/Transforms/Transforms.tsx
@@ -303,7 +303,7 @@ export class Transforms extends MDSEnabledComponent<TransformProps, TransformSta
                   button={actionButton}
                   isOpen={isPopOverOpen}
                   closePopover={this.closePopover}
-                  panelPaddingSize="none"
+                  panelPaddingSize="s"
                   anchorPosition="downLeft"
                   data-test-subj="actionPopover"
                 >
@@ -374,7 +374,7 @@ export class Transforms extends MDSEnabledComponent<TransformProps, TransformSta
                   button={actionButton}
                   isOpen={isPopOverOpen}
                   closePopover={this.closePopover}
-                  panelPaddingSize="none"
+                  panelPaddingSize="s"
                   anchorPosition="downLeft"
                   data-test-subj="actionPopover"
                 >
diff --git a/public/pages/Transforms/containers/Transforms/__snapshots__/EditTransform.test.tsx.snap b/public/pages/Transforms/containers/Transforms/__snapshots__/EditTransform.test.tsx.snap
index bcd30143c..058d8f909 100644
--- a/public/pages/Transforms/containers/Transforms/__snapshots__/EditTransform.test.tsx.snap
+++ b/public/pages/Transforms/containers/Transforms/__snapshots__/EditTransform.test.tsx.snap
@@ -540,7 +540,7 @@ exports[`<EditTransform /> spec renders the component 1`] = `
     class="euiSpacer euiSpacer--l"
   />
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
   >
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"