diff --git a/public/pages/CreateDataStream/containers/CreateDataStream/__snapshots__/CreateDataStream.test.tsx.snap b/public/pages/CreateDataStream/containers/CreateDataStream/__snapshots__/CreateDataStream.test.tsx.snap
index 94c746ed5..cee69c234 100644
--- a/public/pages/CreateDataStream/containers/CreateDataStream/__snapshots__/CreateDataStream.test.tsx.snap
+++ b/public/pages/CreateDataStream/containers/CreateDataStream/__snapshots__/CreateDataStream.test.tsx.snap
@@ -290,7 +290,6 @@ exports[`<CreateDataStream /> spec it goes to data streams page when click cance
           <span
             class="euiButtonContent euiButton__content"
           >
-            EuiIconMock
             <span
               class="euiButton__text"
             >
diff --git a/public/pages/CreateDataStream/containers/DataStreamDetail/DataStreamDetail.tsx b/public/pages/CreateDataStream/containers/DataStreamDetail/DataStreamDetail.tsx
index dfe055244..92a7e58e9 100644
--- a/public/pages/CreateDataStream/containers/DataStreamDetail/DataStreamDetail.tsx
+++ b/public/pages/CreateDataStream/containers/DataStreamDetail/DataStreamDetail.tsx
@@ -315,13 +315,7 @@ const DataStreamDetail = (props: DataStreamDetailProps, ref: Ref<FieldInstance>)
               </EuiSmallButtonEmpty>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <EuiSmallButton
-                fill
-                onClick={onSubmit}
-                isLoading={isLoading}
-                iconType={isEdit ? undefined : "plus"}
-                data-test-subj="CreateDataStreamCreateButton"
-              >
+              <EuiSmallButton fill onClick={onSubmit} isLoading={isLoading} data-test-subj="CreateDataStreamCreateButton">
                 {isEdit ? "Save changes" : "Create data stream"}
               </EuiSmallButton>
             </EuiFlexItem>
diff --git a/public/pages/CreateDataStream/containers/DataStreamDetail/__snapshots__/DataStreamDetail.test.tsx.snap b/public/pages/CreateDataStream/containers/DataStreamDetail/__snapshots__/DataStreamDetail.test.tsx.snap
index 59b2c36dc..a61d58e91 100644
--- a/public/pages/CreateDataStream/containers/DataStreamDetail/__snapshots__/DataStreamDetail.test.tsx.snap
+++ b/public/pages/CreateDataStream/containers/DataStreamDetail/__snapshots__/DataStreamDetail.test.tsx.snap
@@ -287,7 +287,6 @@ exports[`<DataStreamDetail /> spec render component 1`] = `
         <span
           class="euiButtonContent euiButton__content"
         >
-          EuiIconMock
           <span
             class="euiButton__text"
           >
diff --git a/public/pages/CreateRollup/components/AdvancedAggregation/AdvancedAggregation.tsx b/public/pages/CreateRollup/components/AdvancedAggregation/AdvancedAggregation.tsx
index b1861ea96..b265472f0 100644
--- a/public/pages/CreateRollup/components/AdvancedAggregation/AdvancedAggregation.tsx
+++ b/public/pages/CreateRollup/components/AdvancedAggregation/AdvancedAggregation.tsx
@@ -381,11 +381,13 @@ export default class AdvancedAggregation extends Component<AdvancedAggregationPr
                 <Fragment>
                   <EuiFlexItem>
                     <EuiCallOut>
-                      <p>
-                        The order of fields impacts rollup performance. Aggregating by smaller buckets and then by larger buckets is faster
-                        than the opposite. For example, if you are rolling up flight data for five airlines with 100 destinations,
-                        aggregating by airline and then by destination is faster than aggregating by destination first.
-                      </p>
+                      <EuiText size="s">
+                        <p>
+                          The order of fields impacts rollup performance. Aggregating by smaller buckets and then by larger buckets is
+                          faster than the opposite. For example, if you are rolling up flight data for five airlines with 100 destinations,
+                          aggregating by airline and then by destination is faster than aggregating by destination first.
+                        </p>
+                      </EuiText>
                     </EuiCallOut>
                     <EuiSpacer size="s" />
                   </EuiFlexItem>
diff --git a/public/pages/CreateRollup/components/ConfigureRollup/ConfigureRollup.tsx b/public/pages/CreateRollup/components/ConfigureRollup/ConfigureRollup.tsx
index 4576afea4..70dd2ff97 100644
--- a/public/pages/CreateRollup/components/ConfigureRollup/ConfigureRollup.tsx
+++ b/public/pages/CreateRollup/components/ConfigureRollup/ConfigureRollup.tsx
@@ -33,7 +33,6 @@ const ConfigureRollup = ({ isEdit, rollupId, rollupIdError, onChangeName, onChan
       </EuiText>
     </EuiFlexGroup>
     <EuiHorizontalRule margin={"xs"} />
-    <EuiSpacer size="s" />
     <EuiCompressedFormRow
       label={
         <EuiText size="s">
diff --git a/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx b/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx
index 968fa4b3e..fa33e50c8 100644
--- a/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx
+++ b/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx
@@ -130,7 +130,9 @@ export default class RollupIndices extends Component<RollupIndicesProps, RollupI
         <EuiHorizontalRule margin={"xs"} />
         <EuiSpacer size="s" />
         <EuiCallOut color="warning">
-          <p>You can't change indices after creating a job. Double-check the source and target index names before proceeding.</p>
+          <EuiText size="s">
+            <p>You can't change indices after creating a job. Double-check the source and target index names before proceeding.</p>
+          </EuiText>
         </EuiCallOut>
         {hasAggregation && (
           <Fragment>
diff --git a/public/pages/CreateRollup/components/Schedule/Schedule.tsx b/public/pages/CreateRollup/components/Schedule/Schedule.tsx
index c98401a16..c49b3530b 100644
--- a/public/pages/CreateRollup/components/Schedule/Schedule.tsx
+++ b/public/pages/CreateRollup/components/Schedule/Schedule.tsx
@@ -162,7 +162,6 @@ export default class Schedule extends Component<ScheduleProps> {
             data-test-subj="jobEnabledByDefault"
           />
         )}
-        <EuiSpacer size="s" />
         {!isEdit && isContinuous(continuousJob, onChangeContinuousJob)}
 
         <EuiCompressedFormRow
diff --git a/public/pages/CreateRollup/containers/CreateRollupForm/__snapshots__/CreateRollupForm.test.tsx.snap b/public/pages/CreateRollup/containers/CreateRollupForm/__snapshots__/CreateRollupForm.test.tsx.snap
index 4ccd5195a..f226c5e55 100644
--- a/public/pages/CreateRollup/containers/CreateRollupForm/__snapshots__/CreateRollupForm.test.tsx.snap
+++ b/public/pages/CreateRollup/containers/CreateRollupForm/__snapshots__/CreateRollupForm.test.tsx.snap
@@ -176,9 +176,6 @@ exports[`<CreateRollupForm /> spec renders the component 1`] = `
             <hr
               class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"
             />
-            <div
-              class="euiSpacer euiSpacer--s"
-            />
             <div
               class="euiFormRow euiFormRow--compressed"
               id="some_html_id-row"
@@ -311,9 +308,13 @@ exports[`<CreateRollupForm /> spec renders the component 1`] = `
                 <div
                   class="euiTextColor euiTextColor--default"
                 >
-                  <p>
-                    You can't change indices after creating a job. Double-check the source and target index names before proceeding.
-                  </p>
+                  <div
+                    class="euiText euiText--small"
+                  >
+                    <p>
+                      You can't change indices after creating a job. Double-check the source and target index names before proceeding.
+                    </p>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/public/pages/CreateRollup/containers/CreateRollupStep2/CreateRollupStep2.tsx b/public/pages/CreateRollup/containers/CreateRollupStep2/CreateRollupStep2.tsx
index 3ddf6c6b0..253a0ce2a 100644
--- a/public/pages/CreateRollup/containers/CreateRollupStep2/CreateRollupStep2.tsx
+++ b/public/pages/CreateRollup/containers/CreateRollupStep2/CreateRollupStep2.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { ChangeEvent, Component } from "react";
-import { EuiSpacer, EuiTitle, EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiComboBoxOptionOption } from "@elastic/eui";
+import { EuiSpacer, EuiTitle, EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiComboBoxOptionOption, EuiText } from "@elastic/eui";
 import { RouteComponentProps } from "react-router-dom";
 import { RollupService } from "../../../../services";
 import { BREADCRUMBS, ROUTES } from "../../../../utils/constants";
@@ -88,7 +88,9 @@ export default class CreateRollupStep2 extends Component<CreateRollupStep2Props>
             <MetricsCalculation {...this.props} fieldsOption={fields} />
             <EuiSpacer />
             <EuiCallOut color="warning">
-              <p>You can't change aggregations or metrics after creating a job. Double-check your choices before proceeding.</p>
+              <EuiText size="s">
+                <p>You can't change aggregations or metrics after creating a job. Double-check your choices before proceeding.</p>
+              </EuiText>
             </EuiCallOut>
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/public/pages/CreateRollup/containers/CreateRollupStep4/CreateRollupStep4.tsx b/public/pages/CreateRollup/containers/CreateRollupStep4/CreateRollupStep4.tsx
index 2da19f364..c1496458a 100644
--- a/public/pages/CreateRollup/containers/CreateRollupStep4/CreateRollupStep4.tsx
+++ b/public/pages/CreateRollup/containers/CreateRollupStep4/CreateRollupStep4.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { Component } from "react";
-import { EuiSpacer, EuiTitle, EuiFlexGroup, EuiFlexItem, EuiComboBoxOptionOption, EuiCallOut } from "@elastic/eui";
+import { EuiSpacer, EuiTitle, EuiFlexGroup, EuiFlexItem, EuiComboBoxOptionOption, EuiCallOut, EuiText } from "@elastic/eui";
 import { RouteComponentProps } from "react-router-dom";
 import { RollupService } from "../../../../services";
 import { BREADCRUMBS, ROUTES } from "../../../../utils/constants";
@@ -92,7 +92,9 @@ export default class CreateRollupStep4 extends Component<CreateRollupProps> {
             <ScheduleRolesAndNotifications {...this.props} />
             <EuiSpacer />
             <EuiCallOut color="warning">
-              <p>You can't change aggregations or metrics after creating a job. Double-check your choices before proceeding.</p>
+              <EuiText size="s">
+                <p>You can't change aggregations or metrics after creating a job. Double-check your choices before proceeding.</p>
+              </EuiText>
             </EuiCallOut>
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/public/pages/CreateTransform/components/TransformIndices/TransformIndices.tsx b/public/pages/CreateTransform/components/TransformIndices/TransformIndices.tsx
index 92ff5537e..d46424f39 100644
--- a/public/pages/CreateTransform/components/TransformIndices/TransformIndices.tsx
+++ b/public/pages/CreateTransform/components/TransformIndices/TransformIndices.tsx
@@ -276,7 +276,9 @@ export default class TransformIndices extends Component<TransformIndicesProps, T
         <Fragment>
           <EuiSpacer />
           <EuiCallOut color="warning">
-            <p>You can't change indices after creating a job. Double-check the source and target index names before proceeding.</p>
+            <EuiText size="s">
+              <p>You can't change indices after creating a job. Double-check the source and target index names before proceeding.</p>
+            </EuiText>
           </EuiCallOut>
         </Fragment>
       </div>
diff --git a/public/pages/CreateTransform/containers/CreateTransformForm/__snapshots__/CreateTransformForm.test.tsx.snap b/public/pages/CreateTransform/containers/CreateTransformForm/__snapshots__/CreateTransformForm.test.tsx.snap
index f3ff35468..dbc81911d 100644
--- a/public/pages/CreateTransform/containers/CreateTransformForm/__snapshots__/CreateTransformForm.test.tsx.snap
+++ b/public/pages/CreateTransform/containers/CreateTransformForm/__snapshots__/CreateTransformForm.test.tsx.snap
@@ -630,9 +630,13 @@ exports[`<CreateTransformForm /> spec renders the component 1`] = `
                 <div
                   class="euiTextColor euiTextColor--default"
                 >
-                  <p>
-                    You can't change indices after creating a job. Double-check the source and target index names before proceeding.
-                  </p>
+                  <div
+                    class="euiText euiText--small"
+                  >
+                    <p>
+                      You can't change indices after creating a job. Double-check the source and target index names before proceeding.
+                    </p>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/public/pages/DataStreams/containers/DataStreamsActions/index.tsx b/public/pages/DataStreams/containers/DataStreamsActions/index.tsx
index ae01b2f55..b74ccc0c1 100644
--- a/public/pages/DataStreams/containers/DataStreamsActions/index.tsx
+++ b/public/pages/DataStreams/containers/DataStreamsActions/index.tsx
@@ -50,6 +50,7 @@ export default function DataStreamsActions(props: DataStreamsActionsProps) {
     <>
       <SimplePopover
         data-test-subj="moreAction"
+        panelPaddingSize="s"
         button={
           <EuiSmallButton iconType="arrowDown" iconSide="right">
             Actions
diff --git a/public/pages/EditRollup/containers/__snapshots__/EditRollup.test.tsx.snap b/public/pages/EditRollup/containers/__snapshots__/EditRollup.test.tsx.snap
index 1d23ce1ef..7ea0dc15b 100644
--- a/public/pages/EditRollup/containers/__snapshots__/EditRollup.test.tsx.snap
+++ b/public/pages/EditRollup/containers/__snapshots__/EditRollup.test.tsx.snap
@@ -29,9 +29,6 @@ exports[`<EditRollup /> spec renders the component 1`] = `
     <hr
       class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"
     />
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
     <div
       class="euiFormRow euiFormRow--compressed"
       id="some_html_id-row"
@@ -153,9 +150,6 @@ exports[`<EditRollup /> spec renders the component 1`] = `
     <hr
       class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"
     />
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
     <div
       class="euiFormRow euiFormRow--compressed"
       id="some_html_id-row"
diff --git a/public/pages/RollupDetails/components/AggregationAndMetricsSettings/AggregationAndMetricsSettings.tsx b/public/pages/RollupDetails/components/AggregationAndMetricsSettings/AggregationAndMetricsSettings.tsx
index 370002e43..83360c416 100644
--- a/public/pages/RollupDetails/components/AggregationAndMetricsSettings/AggregationAndMetricsSettings.tsx
+++ b/public/pages/RollupDetails/components/AggregationAndMetricsSettings/AggregationAndMetricsSettings.tsx
@@ -143,7 +143,6 @@ export default class AggregationAndMetricsSettings extends Component<
         </EuiFlexGroup>
         <EuiHorizontalRule margin={"xs"} />
         <div>
-          <EuiSpacer size="s" />
           <EuiText size="s">
             <h3>Additional metrics</h3>
           </EuiText>
diff --git a/public/pages/RollupDetails/components/GeneralInformation/GeneralInformation.tsx b/public/pages/RollupDetails/components/GeneralInformation/GeneralInformation.tsx
index 295a9b23b..7747d00c3 100644
--- a/public/pages/RollupDetails/components/GeneralInformation/GeneralInformation.tsx
+++ b/public/pages/RollupDetails/components/GeneralInformation/GeneralInformation.tsx
@@ -60,7 +60,6 @@ export default class GeneralInformation extends Component<GeneralInformationProp
         </EuiFlexGroup>
         <EuiHorizontalRule margin={"xs"} />
         <div>
-          <EuiSpacer size="s" />
           <EuiFlexGrid columns={4}>
             {infoItems.map((item) => (
               <EuiFlexItem key={`${item.term}#${item.value}`}>
diff --git a/public/pages/RollupDetails/components/RollupStatus/RollupStatus.tsx b/public/pages/RollupDetails/components/RollupStatus/RollupStatus.tsx
index 4653b8ed3..90b5e10c9 100644
--- a/public/pages/RollupDetails/components/RollupStatus/RollupStatus.tsx
+++ b/public/pages/RollupDetails/components/RollupStatus/RollupStatus.tsx
@@ -25,7 +25,6 @@ const RollupStatus = ({ metadata }: RollupStatusProps) => (
     </EuiFlexGroup>
     <EuiHorizontalRule margin={"xs"} />
     <div>
-      <EuiSpacer size="s" />
       <EuiFlexGrid columns={4}>
         <EuiFlexItem>
           <EuiText size="s">