diff --git a/src/plugins/discover/public/application/main/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap b/src/plugins/discover/public/application/main/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
index 7153724203adb..6ff7006c1b9b4 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
+++ b/src/plugins/discover/public/application/main/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
@@ -59,10 +59,12 @@ exports[`OpenSearchPanel render 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="manageSearchesBtn"
           fill={true}
           href="/app/management/kibana/objects?_a=(tab:search)"
           onClick={[MockFunction]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Manage searches"
diff --git a/src/plugins/discover/public/components/discover_tour/discover_tour.test.tsx b/src/plugins/discover/public/components/discover_tour/discover_tour.test.tsx
index 7a2e31d500570..4bdbeaa663818 100644
--- a/src/plugins/discover/public/components/discover_tour/discover_tour.test.tsx
+++ b/src/plugins/discover/public/components/discover_tour/discover_tour.test.tsx
@@ -41,7 +41,7 @@ describe('Discover tour', () => {
     expect(component.find(EuiTourStep)).toHaveLength(0);
 
     // one step should become visible after the tour is triggered
-    component.find(`[data-test-subj="${buttonSubjToTestStart}"]`).at(0).simulate('click');
+    component.find(`button[data-test-subj="${buttonSubjToTestStart}"]`).at(0).simulate('click');
 
     expect(component.find(EuiTourStep)).toHaveLength(5);
     expect(
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap b/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
index a3a61f2d6db03..0b8c8c81343b6 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
@@ -19,9 +19,11 @@ exports[`FullTimeRangeSelector renders the selector 1`] = `
     position="top"
   >
     <EuiButton
+      color="primary"
       data-test-subj="mlButtonUseFullData"
       isDisabled={false}
       onClick={[Function]}
+      size="m"
     >
       <FormattedMessage
         defaultMessage="Use full data"
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap b/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
index f790d70b0bc81..a5bf2b49835c4 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
@@ -232,9 +232,11 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule
           grow={false}
         >
           <EuiButton
+            color="primary"
             fill={true}
             isDisabled={false}
             onClick={[Function]}
+            size="m"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -491,9 +493,11 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`]
           grow={false}
         >
           <EuiButton
+            color="primary"
             fill={true}
             isDisabled={false}
             onClick={[Function]}
+            size="m"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -728,9 +732,11 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions
           grow={false}
         >
           <EuiButton
+            color="primary"
             fill={true}
             isDisabled={true}
             onClick={[Function]}
+            size="m"
           >
             <FormattedMessage
               defaultMessage="Save"
diff --git a/x-pack/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap b/x-pack/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
index f6a161cc01999..10fd240eb7a2d 100644
--- a/x-pack/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
+++ b/x-pack/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
@@ -4,6 +4,7 @@ exports[`ValidateJob renders button and modal with a message 1`] = `
 <Fragment>
   <div>
     <EuiButton
+      color="primary"
       fill={true}
       iconSide="right"
       iconType="questionInCircle"
@@ -26,6 +27,7 @@ exports[`ValidateJob renders the button 1`] = `
 <Fragment>
   <div>
     <EuiButton
+      color="primary"
       fill={true}
       iconSide="right"
       iconType="questionInCircle"
@@ -48,6 +50,7 @@ exports[`ValidateJob renders the button and modal with a success message 1`] = `
 <Fragment>
   <div>
     <EuiButton
+      color="primary"
       fill={true}
       iconSide="right"
       iconType="questionInCircle"
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap b/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
index 5ee76aded2fea..4f90af5ab5957 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
@@ -182,7 +182,9 @@ exports[`CalendarForm Renders calendar form 1`] = `
       grow={false}
     >
       <EuiButton
+        color="primary"
         isDisabled={false}
+        size="m"
       >
         <FormattedMessage
           defaultMessage="Cancel"
@@ -195,10 +197,12 @@ exports[`CalendarForm Renders calendar form 1`] = `
       grow={false}
     >
       <EuiButton
+        color="primary"
         data-test-subj="mlSaveCalendarButton"
         fill={true}
         isDisabled={true}
         onClick={[MockFunction]}
+        size="m"
       >
         <FormattedMessage
           defaultMessage="Save"
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap b/x-pack/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
index e3edc563e7c3e..869e282df766e 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
@@ -137,6 +137,7 @@ exports[`EventsTable Renders events table with search bar 1`] = `
         "filters": Array [],
         "toolsRight": Array [
           <EuiButton
+            color="primary"
             data-test-subj="mlCalendarNewEventButton"
             iconType="plusInCircle"
             isDisabled={false}
@@ -150,6 +151,7 @@ exports[`EventsTable Renders events table with search bar 1`] = `
             />
           </EuiButton>,
           <EuiButton
+            color="primary"
             data-test-subj="mlCalendarImportEventsButton"
             iconType="importAction"
             isDisabled={false}
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap b/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
index bc68c71314594..16074e3849d02 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
@@ -63,9 +63,11 @@ exports[`ImportModal Renders import modal 1`] = `
         />
       </EuiButtonEmpty>
       <EuiButton
+        color="primary"
         disabled={true}
         fill={true}
         onClick={[Function]}
+        size="m"
       >
         <FormattedMessage
           defaultMessage="Import"
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
index 7a5cde3b36187..299c1340e8599 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
@@ -140,10 +140,10 @@ describe('NewCalendar', () => {
     const wrapper = mountWithIntl(<NewCalendar {...props} />);
 
     const importButton = wrapper.find('[data-test-subj="mlCalendarNewEventButton"]');
-    const button = importButton.find('EuiButton');
+    const button = importButton.find('EuiButton button');
     button.simulate('click');
 
-    expect(button.prop('isDisabled')).toBe(true);
+    expect(button.prop('disabled')).toBe(true);
   });
 
   test('isDuplicateId returns true if form calendar id already exists in calendars', () => {
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap b/x-pack/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap
index 0d4bba26f1c0e..5733b4ef89a1c 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap
@@ -76,6 +76,7 @@ exports[`CalendarsListTable renders the table with all calendars 1`] = `
         "filters": Array [],
         "toolsRight": Array [
           <EuiButton
+            color="primary"
             data-test-subj="mlCalendarButtonCreate"
             isDisabled={false}
             size="s"
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap b/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
index 90983d1511b71..1045165160a85 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
@@ -74,9 +74,11 @@ exports[`AddItemPopover calls addItems with multiple items on clicking Add butto
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListAddItemsButton"
           disabled={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Add"
@@ -164,9 +166,11 @@ exports[`AddItemPopover opens the popover onButtonClick 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListAddItemsButton"
           disabled={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Add"
@@ -254,9 +258,11 @@ exports[`AddItemPopover renders the popover 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListAddItemsButton"
           disabled={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Add"
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap b/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
index 8cadb8270f680..d4ea0c49612a8 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
@@ -9,6 +9,7 @@ exports[`DeleteFilterListModal false canDeleteFilter privilege renders as disabl
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
+    size="m"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -28,6 +29,7 @@ exports[`DeleteFilterListModal renders as delete button after opening and closin
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
+    size="m"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -47,6 +49,7 @@ exports[`DeleteFilterListModal renders as disabled delete button when no lists s
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
+    size="m"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -66,6 +69,7 @@ exports[`DeleteFilterListModal renders as enabled delete button when a list is s
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
+    size="m"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -85,6 +89,7 @@ exports[`DeleteFilterListModal renders modal after clicking delete button 1`] =
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
+    size="m"
   >
     <FormattedMessage
       defaultMessage="Delete"
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
index f4e79d5b79f4b..155032217425f 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
@@ -84,10 +84,12 @@ exports[`EditFilterList adds new items to filter list 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={false}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"
@@ -190,10 +192,12 @@ exports[`EditFilterList renders after selecting an item and deleting it 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={false}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"
@@ -291,10 +295,12 @@ exports[`EditFilterList renders after selecting an item and deleting it 2`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={false}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"
@@ -376,10 +382,12 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={true}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"
@@ -461,10 +469,12 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={false}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"
@@ -563,10 +573,12 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={false}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"
@@ -665,10 +677,12 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={false}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"
@@ -767,10 +781,12 @@ exports[`EditFilterList updates the items per page 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mlFilterListSaveButton"
           disabled={false}
           fill={true}
           onClick={[Function]}
+          size="m"
         >
           <FormattedMessage
             defaultMessage="Save"