diff --git a/src/plugins/dashboard/public/application/utils/get_no_items_message.tsx b/src/plugins/dashboard/public/application/utils/get_no_items_message.tsx
index e2004dfa8bf4..460fbe9b877d 100644
--- a/src/plugins/dashboard/public/application/utils/get_no_items_message.tsx
+++ b/src/plugins/dashboard/public/application/utils/get_no_items_message.tsx
@@ -5,12 +5,7 @@
 
 import React, { Fragment } from 'react';
 import { FormattedMessage } from '@osd/i18n/react';
-import {
-  EuiSmallButton,
-  EuiEmptyPrompt,
-  EuiLink,
-  EuiText,
-} from '@elastic/eui';
+import { EuiSmallButton, EuiEmptyPrompt, EuiLink, EuiText } from '@elastic/eui';
 import { ApplicationStart } from 'opensearch-dashboards/public';
 
 export const getNoItemsMessage = (
diff --git a/src/plugins/data_source_management/public/components/data_source_error_menu/data_source_error_menu.tsx b/src/plugins/data_source_management/public/components/data_source_error_menu/data_source_error_menu.tsx
index aa9ec9934ec3..f4bbc239ff70 100644
--- a/src/plugins/data_source_management/public/components/data_source_error_menu/data_source_error_menu.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_error_menu/data_source_error_menu.tsx
@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 import { i18n } from '@osd/i18n';
 import { ApplicationStart } from 'opensearch-dashboards/public';
 import {
-  EuiSmallButtonIcon,
+  EuiButtonIcon,
   EuiButton,
   EuiFlexGroup,
   EuiFlexItem,
@@ -41,7 +41,7 @@ export const DataSourceErrorMenu = ({ application }: DataSourceErrorMenuProps) =
   );
 
   const iconButton = (
-    <EuiSmallButtonIcon
+    <EuiButtonIcon
       className="euiHeaderLink"
       data-test-subj="dataSourceErrorMenuHeaderLink"
       aria-label={i18n.translate('dataSourceError.dataSourceErrorMenuHeaderLink', {
diff --git a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_source_configuration/configure_direct_query_data_sources.tsx b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_source_configuration/configure_direct_query_data_sources.tsx
index 94d6850bf1b3..530d7151dde6 100644
--- a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_source_configuration/configure_direct_query_data_sources.tsx
+++ b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_source_configuration/configure_direct_query_data_sources.tsx
@@ -12,8 +12,8 @@ import {
   EuiSteps,
   EuiPageSideBar,
   EuiBottomBar,
-  EuiSmallButtonEmpty,
-  EuiSmallButton,
+  EuiButtonEmpty,
+  EuiButton,
 } from '@elastic/eui';
 import React, { useEffect, useState, useCallback } from 'react';
 import { RouteComponentProps, useParams, withRouter } from 'react-router-dom';
@@ -311,7 +311,7 @@ export const DirectQueryDataSourceConfigure: React.FC<ConfigureDatasourceProps>
       <EuiBottomBar data-test-subj="reviewSaveOrCancel">
         <EuiFlexGroup justifyContent="flexEnd">
           <EuiFlexItem grow={false}>
-            <EuiSmallButtonEmpty
+            <EuiButtonEmpty
               onClick={() => {
                 history.push('/create');
               }}
@@ -321,10 +321,10 @@ export const DirectQueryDataSourceConfigure: React.FC<ConfigureDatasourceProps>
               data-test-subj="cancelButton"
             >
               Cancel
-            </EuiSmallButtonEmpty>
+            </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiSmallButton
+            <EuiButton
               onClick={() => setPage('configure')}
               color="ghost"
               size="s"
@@ -332,10 +332,10 @@ export const DirectQueryDataSourceConfigure: React.FC<ConfigureDatasourceProps>
               data-test-subj="previousButton"
             >
               Previous
-            </EuiSmallButton>
+            </EuiButton>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiSmallButton
+            <EuiButton
               onClick={() => (page === 'review' ? createDatasource() : setPage('review'))}
               size="s"
               iconType="arrowRight"
@@ -345,7 +345,7 @@ export const DirectQueryDataSourceConfigure: React.FC<ConfigureDatasourceProps>
               {page === 'configure'
                 ? `Review Configuration`
                 : `Connect to ${DatasourceTypeToDisplayName[type]}`}
-            </EuiSmallButton>
+            </EuiButton>
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiBottomBar>
diff --git a/src/plugins/data_source_management/public/components/no_data_source/no_data_source.tsx b/src/plugins/data_source_management/public/components/no_data_source/no_data_source.tsx
index a3a6746b8a7b..6b48a7a7a0b4 100644
--- a/src/plugins/data_source_management/public/components/no_data_source/no_data_source.tsx
+++ b/src/plugins/data_source_management/public/components/no_data_source/no_data_source.tsx
@@ -13,7 +13,7 @@ import {
   EuiText,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiSmallButtonIcon,
+  EuiButtonIcon,
 } from '@elastic/eui';
 import { ApplicationStart } from 'opensearch-dashboards/public';
 import { FormattedMessage } from 'react-intl';
@@ -38,7 +38,7 @@ export const NoDataSource: React.FC<DataSourceDropDownHeaderProps> = ({
 }) => {
   const [showPopover, setShowPopover] = useState<boolean>(false);
   const button = (
-    <EuiSmallButtonIcon
+    <EuiButtonIcon
       className="euiHeaderLink"
       data-test-subj="dataSourceEmptyMenuHeaderLink"
       aria-label={i18n.translate('dataSourceEmpty.dataSourceEmptyMenuHeaderLink', {
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
index 5fb4ec407eca..ce22761e75fa 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
@@ -29,14 +29,7 @@
  */
 
 import React, { useState, useEffect } from 'react';
-import {
-  EuiLink,
-  EuiIconTip,
-  EuiText,
-  EuiPopoverFooter,
-  EuiSmallButton,
-  EuiSpacer,
-} from '@elastic/eui';
+import { EuiLink, EuiIconTip, EuiText, EuiPopoverFooter, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
 import { DiscoverFieldBucket } from './discover_field_bucket';
 import { getWarnings } from './lib/get_warnings';
@@ -114,7 +107,7 @@ export function DiscoverFieldDetails({
           <div data-test-subj={`fieldVisualizeLink`}>
             <EuiSpacer size="xs" />
             {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
-            <EuiSmallButton
+            <EuiButton
               onClick={(e) => handleVisualizeLinkClick(e)}
               href={visualizeLink}
               size="s"
@@ -125,7 +118,7 @@ export function DiscoverFieldDetails({
                 id="discover.fieldChooser.detailViews.visualizeLinkText"
                 defaultMessage="Visualize"
               />
-            </EuiSmallButton>
+            </EuiButton>
             {warnings.length > 0 && (
               <EuiIconTip type="alert" color="warning" content={warnings.join(' ')} />
             )}
diff --git a/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx b/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx
index 52c631ac67c7..1bc4da9a08cf 100644
--- a/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx
+++ b/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx
@@ -100,7 +100,6 @@ export function OpenSearchPanel({ onClose, makeUrl }: Props) {
       <EuiFlyoutFooter>
         <EuiFlexGroup justifyContent="flexEnd">
           <EuiFlexItem grow={false}>
-            {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
             <EuiSmallButtonEmpty
               onClick={onClose}
               href={addBasePath(
diff --git a/src/plugins/visualizations/public/wizard/type_selection/new_vis_help.tsx b/src/plugins/visualizations/public/wizard/type_selection/new_vis_help.tsx
index 5b296beb60a1..12a3bae61fd9 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/new_vis_help.tsx
+++ b/src/plugins/visualizations/public/wizard/type_selection/new_vis_help.tsx
@@ -30,7 +30,7 @@
 
 import { FormattedMessage } from '@osd/i18n/react';
 import React, { Fragment } from 'react';
-import { EuiText, EuiSmallButton } from '@elastic/eui';
+import { EuiText, EuiButton } from '@elastic/eui';
 import { VisTypeAlias } from '../../vis_types';
 
 interface Props {
@@ -52,7 +52,7 @@ export function NewVisHelp(props: Props) {
           <p>
             <strong>{t.promotion!.description}</strong>
           </p>
-          <EuiSmallButton
+          <EuiButton
             onClick={() => props.onPromotionClicked(t)}
             fill
             size="s"
@@ -60,7 +60,7 @@ export function NewVisHelp(props: Props) {
             iconSide="right"
           >
             {t.promotion!.buttonText}
-          </EuiSmallButton>
+          </EuiButton>
         </Fragment>
       ))}
     </EuiText>