diff --git a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
index 17941445c9..6f3d5e33ab 100644
--- a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
+++ b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
@@ -128,8 +128,8 @@ describe('AlteredSliceTag', () => {
       );
       const th = getTableWrapperFromModalBody(modalBody).find('th');
       expect(th).toHaveLength(3);
-      ['Control', 'Before', 'After'].forEach((v, i) => {
-        expect(th.find('span').get(i).props.children[0]).toBe(v);
+      ['Control', 'Before', 'After'].forEach(async (v, i) => {
+        await expect(th.find('span').get(i).props.children[0]).toBe(v);
       });
     });
 
diff --git a/superset-frontend/src/components/dataViewCommon/TableCollection.tsx b/superset-frontend/src/components/dataViewCommon/TableCollection.tsx
index e6f46609d9..b200eb158b 100644
--- a/superset-frontend/src/components/dataViewCommon/TableCollection.tsx
+++ b/superset-frontend/src/components/dataViewCommon/TableCollection.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import cx from 'classnames';
 import { TableInstance } from 'react-table';
 import { styled } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 interface TableCollectionProps {
   getTableProps: (userProps?: any) => any;
@@ -228,11 +228,11 @@ export default React.memo(
         {headerGroups.map(headerGroup => (
           <tr {...headerGroup.getHeaderGroupProps()}>
             {headerGroup.headers.map(column => {
-              let sortIcon = <Icon name="sort" />;
+              let sortIcon = <Icons.Sort />;
               if (column.isSorted && column.isSortedDesc) {
-                sortIcon = <Icon name="sort-desc" />;
+                sortIcon = <Icons.SortDesc />;
               } else if (column.isSorted && !column.isSortedDesc) {
-                sortIcon = <Icon name="sort-asc" />;
+                sortIcon = <Icons.SortAsc />;
               }
               return column.hidden ? null : (
                 <th