diff --git a/src/plugins/data_source_management/public/components/data_source_aggregated_view/__snapshots__/data_source_aggregated_view.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_aggregated_view/__snapshots__/data_source_aggregated_view.test.tsx.snap
index 3df5b5be920d..f6324c17061d 100644
--- a/src/plugins/data_source_management/public/components/data_source_aggregated_view/__snapshots__/data_source_aggregated_view.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_aggregated_view/__snapshots__/data_source_aggregated_view.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -129,7 +129,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -259,7 +259,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -377,7 +377,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -501,7 +501,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -625,7 +625,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -755,7 +755,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -873,7 +873,7 @@ exports[`DataSourceAggregatedView: read active view (displayAllCompatibleDataSou
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -997,7 +997,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1084,7 +1084,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1171,7 +1171,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1258,7 +1258,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1345,7 +1345,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1432,7 +1432,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1519,7 +1519,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1606,7 +1606,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1693,7 +1693,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
@@ -1780,7 +1780,7 @@ exports[`DataSourceAggregatedView: read all view (displayAllCompatibleDataSource
   <EuiPopover
     anchorPosition="downLeft"
     button={
-      <PopoverButton
+      <DataSourceMenuPopoverButton
         className="dataSourceAggregatedView"
         onClick={[Function]}
       />
diff --git a/src/plugins/data_source_management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx b/src/plugins/data_source_management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx
index b4ea78ce9ce3..00eacb2ea844 100644
--- a/src/plugins/data_source_management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx
@@ -4,15 +4,7 @@
  */
 
 import React from 'react';
-import {
-  EuiButtonEmpty,
-  EuiContextMenuPanel,
-  EuiPanel,
-  EuiPopover,
-  EuiSelectable,
-  EuiSwitch,
-} from '@elastic/eui';
-import { i18n } from '@osd/i18n';
+import { EuiContextMenuPanel, EuiPanel, EuiPopover, EuiSelectable, EuiSwitch } from '@elastic/eui';
 import {
   ApplicationStart,
   IUiSettingsClient,
@@ -34,7 +26,7 @@ import { DataSourceOption } from '../data_source_menu/types';
 import { DataSourceItem } from '../data_source_item';
 import { DataSourceDropDownHeader } from '../drop_down_header';
 import './data_source_aggregated_view.scss';
-import { PopoverButton } from '../popover_button/popover_button';
+import { DataSourceMenuPopoverButton } from '../popover_button/popover_button';
 
 interface DataSourceAggregatedViewProps {
   savedObjectsClient: SavedObjectsClientContract;
@@ -205,7 +197,7 @@ export class DataSourceAggregatedView extends React.Component<
         <EuiPopover
           id={'dataSourceSViewContextMenuPopover'}
           button={
-            <PopoverButton
+            <DataSourceMenuPopoverButton
               className={'dataSourceAggregatedView'}
               onClick={this.onDataSourcesClick.bind(this)}
             />
diff --git a/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap
index 1f55045bc0c4..443ec2faa18c 100644
--- a/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`DataSourceSelectable should filter options if configured 1`] = `
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <PopoverButton
+    <DataSourceMenuPopoverButton
       className="dataSourceSelectable"
       label="Local cluster"
       onClick={[Function]}
@@ -80,7 +80,7 @@ exports[`DataSourceSelectable should render normally with local cluster is hidde
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <PopoverButton
+    <DataSourceMenuPopoverButton
       className="dataSourceSelectable"
       label=""
       onClick={[Function]}
@@ -140,7 +140,7 @@ exports[`DataSourceSelectable should render normally with local cluster not hidd
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <PopoverButton
+    <DataSourceMenuPopoverButton
       className="dataSourceSelectable"
       label=""
       onClick={[Function]}
diff --git a/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx b/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx
index 4d89a14be9a6..63b9eebf26c1 100644
--- a/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx
@@ -9,7 +9,6 @@ import {
   EuiPopover,
   EuiContextMenuPanel,
   EuiPanel,
-  EuiButtonEmpty,
   EuiSelectable,
   EuiPopoverTitle,
 } from '@elastic/eui';
@@ -37,7 +36,7 @@ import './data_source_selectable.scss';
 import { DataSourceDropDownHeader } from '../drop_down_header';
 import '../button_title.scss';
 import './data_source_selectable.scss';
-import { PopoverButton } from '../popover_button/popover_button';
+import { DataSourceMenuPopoverButton } from '../popover_button/popover_button';
 
 interface DataSourceSelectableProps {
   savedObjectsClient: SavedObjectsClientContract;
@@ -261,7 +260,7 @@ export class DataSourceSelectable extends React.Component<
         initialFocus={'.euiSelectableSearch'}
         id={'dataSourceSelectableContextMenuPopover'}
         button={
-          <PopoverButton
+          <DataSourceMenuPopoverButton
             className={'dataSourceSelectable'}
             label={label}
             onClick={this.onClick.bind(this)}
diff --git a/src/plugins/data_source_management/public/components/data_source_view/__snapshots__/data_source_view.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_view/__snapshots__/data_source_view.test.tsx.snap
index c49e903cf388..86ce46dbfa27 100644
--- a/src/plugins/data_source_management/public/components/data_source_view/__snapshots__/data_source_view.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_view/__snapshots__/data_source_view.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`DataSourceView Should render successfully when provided datasource has
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <PopoverButton
+    <DataSourceMenuPopoverButton
       className="dataSourceView"
       label=""
       onClick={[Function]}
@@ -32,7 +32,6 @@ exports[`DataSourceView Should render successfully when provided datasource has
       paddingSize="none"
     >
       <EuiSelectable
-        compressed={true}
         data-test-subj="dataSourceView"
         isPreFiltered={false}
         options={
@@ -59,19 +58,11 @@ exports[`DataSourceView Should return error when provided datasource has been fi
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <React.Fragment>
-      <EuiButtonEmpty
-        aria-label="dataSourceViewButton"
-        className="dataSourceComponentButtonTitle"
-        data-test-subj="dataSourceViewButton"
-        iconSide="left"
-        iconType="database"
-        onClick={[Function]}
-        size="s"
-      >
-        
-      </EuiButtonEmpty>
-    </React.Fragment>
+    <DataSourceMenuPopoverButton
+      className="dataSourceView"
+      label=""
+      onClick={[Function]}
+    />
   }
   closePopover={[Function]}
   display="inlineBlock"
@@ -95,7 +86,6 @@ exports[`DataSourceView Should return error when provided datasource has been fi
       paddingSize="none"
     >
       <EuiSelectable
-        compressed={true}
         data-test-subj="dataSourceView"
         isPreFiltered={false}
         options={Array []}
@@ -114,19 +104,11 @@ exports[`DataSourceView When selected option is local cluster and hide local Clu
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <React.Fragment>
-      <EuiButtonEmpty
-        aria-label="dataSourceViewButton"
-        className="dataSourceComponentButtonTitle"
-        data-test-subj="dataSourceViewButton"
-        iconSide="left"
-        iconType="database"
-        onClick={[Function]}
-        size="s"
-      >
-        
-      </EuiButtonEmpty>
-    </React.Fragment>
+    <DataSourceMenuPopoverButton
+      className="dataSourceView"
+      label=""
+      onClick={[Function]}
+    />
   }
   closePopover={[Function]}
   display="inlineBlock"
@@ -150,7 +132,6 @@ exports[`DataSourceView When selected option is local cluster and hide local Clu
       paddingSize="none"
     >
       <EuiSelectable
-        compressed={true}
         data-test-subj="dataSourceView"
         isPreFiltered={false}
         options={Array []}
@@ -169,7 +150,7 @@ exports[`DataSourceView should call getDataSourceById when only pass id with no
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <PopoverButton
+    <DataSourceMenuPopoverButton
       className="dataSourceView"
       label=""
       onClick={[Function]}
@@ -197,7 +178,6 @@ exports[`DataSourceView should call getDataSourceById when only pass id with no
       paddingSize="none"
     >
       <EuiSelectable
-        compressed={true}
         data-test-subj="dataSourceView"
         isPreFiltered={false}
         options={
@@ -226,7 +206,7 @@ exports[`DataSourceView should render normally with local cluster not hidden 1`]
 <EuiPopover
   anchorPosition="downLeft"
   button={
-    <PopoverButton
+    <DataSourceMenuPopoverButton
       className="dataSourceView"
       label="test1"
       onClick={[Function]}
@@ -254,7 +234,6 @@ exports[`DataSourceView should render normally with local cluster not hidden 1`]
       paddingSize="none"
     >
       <EuiSelectable
-        compressed={true}
         data-test-subj="dataSourceView"
         isPreFiltered={false}
         options={
diff --git a/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx b/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx
index ac053429f81b..f0d53ab92ddf 100644
--- a/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx
@@ -25,7 +25,7 @@ import { DataSourceDropDownHeader } from '../drop_down_header';
 import { DataSourceItem } from '../data_source_item';
 import { LocalCluster } from '../constants';
 import './data_source_view.scss';
-import { PopoverButton } from '../popover_button/popover_button';
+import { DataSourceMenuPopoverButton } from '../popover_button/popover_button';
 
 interface DataSourceViewProps {
   fullWidth: boolean;
@@ -159,7 +159,7 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
       <EuiPopover
         id={'dataSourceViewPopover'}
         button={
-          <PopoverButton
+          <DataSourceMenuPopoverButton
             className={'dataSourceView'}
             label={label}
             onClick={this.onClick.bind(this)}
@@ -177,7 +177,6 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
               options={options}
               singleSelection={true}
               data-test-subj={'dataSourceView'}
-              compressed={true}
               renderOption={(option) => (
                 <DataSourceItem
                   option={option}
diff --git a/src/plugins/data_source_management/public/components/popover_button/popover_button.test.tsx b/src/plugins/data_source_management/public/components/popover_button/popover_button.test.tsx
index 7622ef7f47a3..9d895de782a4 100644
--- a/src/plugins/data_source_management/public/components/popover_button/popover_button.test.tsx
+++ b/src/plugins/data_source_management/public/components/popover_button/popover_button.test.tsx
@@ -5,24 +5,28 @@
 
 import React from 'react';
 import { shallow, mount } from 'enzyme';
-import { PopoverButton } from './popover_button';
+import { DataSourceMenuPopoverButton } from './popover_button';
 
 describe('Test on PopoverButton', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
   it('renders without crashing', () => {
-    shallow(<PopoverButton className="random" label="button-name" onClick={jest.fn()} />);
+    shallow(
+      <DataSourceMenuPopoverButton className="random" label="button-name" onClick={jest.fn()} />
+    );
   });
 
   it('renders the label correctly', () => {
     const label = 'Test Label';
-    const component = mount(<PopoverButton className="random" label={label} onClick={jest.fn()} />);
+    const component = mount(
+      <DataSourceMenuPopoverButton className="random" label={label} onClick={jest.fn()} />
+    );
     expect(component.find('EuiButtonEmpty').text()).toBe(label);
   });
 
   it('calls onClick when button is clicked', () => {
-    const component = mount(<PopoverButton className="random" onClick={jest.fn()} />);
+    const component = mount(<DataSourceMenuPopoverButton className="random" onClick={jest.fn()} />);
     component.find('.dataSourceComponentButtonTitle').first().simulate('click');
     expect(component.find('EuiButtonEmpty').text()).toBe('');
   });
diff --git a/src/plugins/data_source_management/public/components/popover_button/popover_button.tsx b/src/plugins/data_source_management/public/components/popover_button/popover_button.tsx
index a15f81e2e7e1..543f944e7468 100644
--- a/src/plugins/data_source_management/public/components/popover_button/popover_button.tsx
+++ b/src/plugins/data_source_management/public/components/popover_button/popover_button.tsx
@@ -6,13 +6,17 @@ import React from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 
-interface PopoverButtonProps {
+interface DataSourceMenuPopoverButtonProps {
   className: string;
   label?: string;
   onClick: () => void;
 }
 
-export const PopoverButton: React.FC<PopoverButtonProps> = ({ className, label, onClick }) => {
+export const DataSourceMenuPopoverButton: React.FC<DataSourceMenuPopoverButtonProps> = ({
+  className,
+  label,
+  onClick,
+}) => {
   return (
     <>
       <EuiButtonEmpty