diff --git a/public/components/datasources/components/new/configure_datasource.tsx b/public/components/datasources/components/new/configure_datasource.tsx
index 8e410865c..9cd7ccd34 100644
--- a/public/components/datasources/components/new/configure_datasource.tsx
+++ b/public/components/datasources/components/new/configure_datasource.tsx
@@ -9,11 +9,11 @@ import {
   EuiPage,
   EuiPageBody,
   EuiSpacer,
-  EuiSmallButton,
+  EuiButton,
   EuiSteps,
   EuiPageSideBar,
   EuiBottomBar,
-  EuiSmallButtonEmpty,
+  EuiButtonEmpty,
 } from '@elastic/eui';
 import React, { useCallback, useEffect, useState } from 'react';
 import { ConfigureS3Datasource } from './configure_s3_datasource';
@@ -194,7 +194,7 @@ export function Configure(props: ConfigureDatasourceProps) {
       <EuiBottomBar>
         <EuiFlexGroup justifyContent="flexEnd">
           <EuiFlexItem grow={false}>
-            <EuiSmallButtonEmpty
+            <EuiButtonEmpty
               onClick={() => {
                 window.location.hash = '#/new';
               }}
@@ -203,20 +203,20 @@ export function Configure(props: ConfigureDatasourceProps) {
               iconType="cross"
             >
               Cancel
-            </EuiSmallButtonEmpty>
+            </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiSmallButton
+            <EuiButton
               onClick={() => (page === 'review' ? setPage('configure') : {})}
               color="ghost"
               size="s"
               iconType="arrowLeft"
             >
               Previous
-            </EuiSmallButton>
+            </EuiButton>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiSmallButton
+            <EuiButton
               onClick={() => (page === 'review' ? createDatasource() : setPage('review'))}
               size="s"
               iconType="arrowRight"
@@ -225,7 +225,7 @@ export function Configure(props: ConfigureDatasourceProps) {
               {page === 'configure'
                 ? `Review Configuration`
                 : `Connect to ${DatasourceTypeToDisplayName[type]}`}
-            </EuiSmallButton>
+            </EuiButton>
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiBottomBar>
diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx b/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx
index e995597e8..617205173 100644
--- a/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx
+++ b/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx
@@ -5,7 +5,7 @@
 
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import {
-  EuiSmallButton,
+  EuiButton,
   EuiCompressedComboBox,
   EuiComboBoxOptionOption,
   EuiCompressedFieldNumber,
@@ -581,7 +581,7 @@ export const DataConfigPanelItem = ({
         )}
         <div className="logExplorerVisConfig__content">
           <EuiFlexItem grow={false}>
-            <EuiSmallButton
+            <EuiButton
               data-test-subj="visualizeEditorRenderButton"
               iconType="play"
               onClick={() => updateChart()}
@@ -589,7 +589,7 @@ export const DataConfigPanelItem = ({
               isDisabled={isEmpty(configList[AGGREGATIONS])}
             >
               Update chart
-            </EuiSmallButton>
+            </EuiButton>
           </EuiFlexItem>
         </div>
       </div>
diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/treemap_config_panel_item.tsx b/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/treemap_config_panel_item.tsx
index 327f905b9..9bb768253 100644
--- a/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/treemap_config_panel_item.tsx
+++ b/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/treemap_config_panel_item.tsx
@@ -4,7 +4,7 @@
  */
 
 import {
-  EuiSmallButton,
+  EuiButton,
   EuiCompressedComboBox,
   EuiComboBoxOptionOption,
   EuiFlexItem,
@@ -262,14 +262,14 @@ export const TreemapConfigPanelItem = ({
       <EuiSpacer size="s" />
       <EuiSpacer size="s" />
       <EuiFlexItem grow={false}>
-        <EuiSmallButton
+        <EuiButton
           data-test-subj="visualizeEditorRenderButton"
           iconType="play"
           onClick={() => updateChart()}
           size="s"
         >
           Update chart
-        </EuiSmallButton>
+        </EuiButton>
       </EuiFlexItem>
     </div>
   );
diff --git a/public/components/trace_analytics/components/dashboard/latency_trend_cell.tsx b/public/components/trace_analytics/components/dashboard/latency_trend_cell.tsx
index 26a57ffbc..7baca2010 100644
--- a/public/components/trace_analytics/components/dashboard/latency_trend_cell.tsx
+++ b/public/components/trace_analytics/components/dashboard/latency_trend_cell.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiSmallButtonIcon, EuiFlexGroup, EuiFlexItem, EuiPopover, EuiText } from '@elastic/eui';
+import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiPopover, EuiText } from '@elastic/eui';
 import React, { useState } from 'react';
 import { LatencyPlt, LinePlt } from '../common/plots/latency_trend_plt';
 
@@ -29,7 +29,7 @@ export function LatencyTrendCell({
           ownFocus
           anchorPosition="downCenter"
           button={
-            <EuiSmallButtonIcon
+            <EuiButtonIcon
               aria-label="Open popover"
               onClick={() => setIsPopoverOpen(true)}
               iconType="magnifyWithPlus"