diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts
index 6910b23b2f..1335fcb422 100644
--- a/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts
@@ -22,7 +22,7 @@ describe('chart card view', () => {
beforeEach(() => {
cy.login();
cy.visit(CHART_LIST);
- cy.get('[data-test="card-view"]').click();
+ cy.get('[aria-label="card-view"]').click();
});
it('should load cards', () => {
diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts
index dd9b573eba..6892651e00 100644
--- a/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts
@@ -22,7 +22,7 @@ describe('chart card view filters', () => {
beforeEach(() => {
cy.login();
cy.visit(CHART_LIST);
- cy.get('[data-test="card-view"]').click();
+ cy.get('[aria-label="card-view"]').click();
});
it('should filter by owners correctly', () => {
@@ -89,7 +89,7 @@ describe('chart list view filters', () => {
beforeEach(() => {
cy.login();
cy.visit(CHART_LIST);
- cy.get('[data-test="list-view"]').click();
+ cy.get('[aria-label="list-view"]').click();
});
it('should filter by owners correctly', () => {
diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts
index 7b51e984e2..6da5d90106 100644
--- a/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts
@@ -22,7 +22,7 @@ describe('chart list view', () => {
beforeEach(() => {
cy.login();
cy.visit(CHART_LIST);
- cy.get('[data-test="list-view"]').click();
+ cy.get('[aria-label="list-view"]').click();
});
it('should load rows', () => {
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts
index 35f11a17ea..8bfc35d71c 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts
@@ -22,7 +22,7 @@ describe('Dashboard card view', () => {
beforeEach(() => {
cy.login();
cy.visit(DASHBOARD_LIST);
- cy.get('[data-test="card-view"]').click();
+ cy.get('[aria-label="card-view"]').click();
});
xit('should load cards', () => {
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts
index caff4c03f6..d9bf0bb77b 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts
@@ -22,7 +22,7 @@ describe('dashboard filters card view', () => {
beforeEach(() => {
cy.login();
cy.visit(DASHBOARD_LIST);
- cy.get('[data-test="card-view"]').click();
+ cy.get('[aria-label="card-view"]').click();
});
it('should filter by owners correctly', () => {
@@ -73,7 +73,7 @@ describe('dashboard filters list view', () => {
beforeEach(() => {
cy.login();
cy.visit(DASHBOARD_LIST);
- cy.get('[data-test="list-view"]').click();
+ cy.get('[aria-label="list-view"]').click();
});
it('should filter by owners correctly', () => {
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts
index 045d43c4c5..a758552481 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts
@@ -22,7 +22,7 @@ describe('dashboard list view', () => {
beforeEach(() => {
cy.login();
cy.visit(DASHBOARD_LIST);
- cy.get('[data-test="list-view"]').click();
+ cy.get('[aria-label="list-view"]').click();
});
xit('should load rows', () => {
diff --git a/superset-frontend/src/components/ListView/ListView.tsx b/superset-frontend/src/components/ListView/ListView.tsx
index 22729bd192..f74e799ee2 100644
--- a/superset-frontend/src/components/ListView/ListView.tsx
+++ b/superset-frontend/src/components/ListView/ListView.tsx
@@ -23,7 +23,7 @@ import Alert from 'src/components/Alert';
import { ReactComponent as EmptyImage } from 'images/empty.svg';
import cx from 'classnames';
import Button from 'src/components/Button';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
import IndeterminateCheckbox from 'src/components/IndeterminateCheckbox';
import { TableCollection, Pagination } from 'src/components/dataViewCommon';
import CardCollection from './CardCollection';
@@ -142,7 +142,7 @@ const ViewModeContainer = styled.div`
display: inline-block;
border-radius: ${({ theme }) => theme.gridUnit / 2}px;
padding: ${({ theme }) => theme.gridUnit}px;
- padding-bottom: 0;
+ padding-bottom: ${({ theme }) => theme.gridUnit * 0.5}px;
&:first-of-type {
margin-right: ${({ theme }) => theme.gridUnit * 2}px;
@@ -182,7 +182,7 @@ const ViewModeToggle = ({
}}
className={cx('toggle-button', { active: mode === 'card' })}
>
-