diff --git a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
index 55b037cb8307..cb7e4410472c 100644
--- a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
@@ -12,9 +12,6 @@ Object {
         <div
           class="euiPopover__anchor"
         >
-          <span
-            data-euiicon-type="database"
-          />
           <button
             aria-label="dataSourceMenuButton"
             class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
@@ -22,12 +19,12 @@ Object {
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+              class="euiButtonContent euiButtonEmpty__content"
             >
               <span
                 class="euiButtonContent__icon"
                 color="inherit"
-                data-euiicon-type="arrowDown"
+                data-euiicon-type="database"
               />
               <span
                 class="euiButtonEmpty__text"
@@ -46,9 +43,6 @@ Object {
       <div
         class="euiPopover__anchor"
       >
-        <span
-          data-euiicon-type="database"
-        />
         <button
           aria-label="dataSourceMenuButton"
           class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
@@ -56,12 +50,12 @@ Object {
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+            class="euiButtonContent euiButtonEmpty__content"
           >
             <span
               class="euiButtonContent__icon"
               color="inherit"
-              data-euiicon-type="arrowDown"
+              data-euiicon-type="database"
             />
             <span
               class="euiButtonEmpty__text"
@@ -145,9 +139,6 @@ Object {
             <div
               class="euiPopover__anchor"
             >
-              <span
-                data-euiicon-type="database"
-              />
               <button
                 aria-label="dataSourceMenuButton"
                 class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
@@ -155,12 +146,12 @@ Object {
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                  class="euiButtonContent euiButtonEmpty__content"
                 >
                   <span
                     class="euiButtonContent__icon"
                     color="inherit"
-                    data-euiicon-type="arrowDown"
+                    data-euiicon-type="database"
                   />
                   <span
                     class="euiButtonEmpty__text"
diff --git a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap
index 944750bde432..2994baa77dcd 100644
--- a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap
@@ -5,16 +5,13 @@ exports[`DataSourceSelectable should filter options if configured 1`] = `
   anchorPosition="downLeft"
   button={
     <React.Fragment>
-      <EuiIcon
-        type="database"
-      />
       <EuiButtonEmpty
         aria-label="dataSourceMenuButton"
         className="euiHeaderLink"
         data-test-subj="dataSourceSelectableContextMenuHeaderLink"
         disabled={false}
-        iconSide="right"
-        iconType="arrowDown"
+        iconSide="left"
+        iconType="database"
         onClick={[Function]}
         size="s"
       >
@@ -81,16 +78,13 @@ exports[`DataSourceSelectable should render normally with local cluster is hidde
   anchorPosition="downLeft"
   button={
     <React.Fragment>
-      <EuiIcon
-        type="database"
-      />
       <EuiButtonEmpty
         aria-label="dataSourceMenuButton"
         className="euiHeaderLink"
         data-test-subj="dataSourceSelectableContextMenuHeaderLink"
         disabled={false}
-        iconSide="right"
-        iconType="arrowDown"
+        iconSide="left"
+        iconType="database"
         onClick={[Function]}
         size="s"
       >
@@ -142,16 +136,13 @@ exports[`DataSourceSelectable should render normally with local cluster not hidd
   anchorPosition="downLeft"
   button={
     <React.Fragment>
-      <EuiIcon
-        type="database"
-      />
       <EuiButtonEmpty
         aria-label="dataSourceMenuButton"
         className="euiHeaderLink"
         data-test-subj="dataSourceSelectableContextMenuHeaderLink"
         disabled={false}
-        iconSide="right"
-        iconType="arrowDown"
+        iconSide="left"
+        iconType="database"
         onClick={[Function]}
         size="s"
       >
diff --git a/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx b/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx
index 81f5a9c7c073..f8b19271f13b 100644
--- a/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx
@@ -126,7 +126,6 @@ export class DataSourceSelectable extends React.Component<
   render() {
     const button = (
       <>
-        <EuiIcon type="database" />
         <EuiButtonEmpty
           className="euiHeaderLink"
           onClick={this.onClick.bind(this)}
@@ -134,8 +133,8 @@ export class DataSourceSelectable extends React.Component<
           aria-label={i18n.translate('dataSourceSelectable.dataSourceOptionsButtonAriaLabel', {
             defaultMessage: 'dataSourceMenuButton',
           })}
-          iconType="arrowDown"
-          iconSide="right"
+          iconType="database"
+          iconSide="left"
           size="s"
           disabled={this.props.disabled || false}
         >