diff --git a/superset-frontend/images/icons/fx.svg b/superset-frontend/images/icons/function_x.svg
similarity index 100%
rename from superset-frontend/images/icons/fx.svg
rename to superset-frontend/images/icons/function_x.svg
diff --git a/superset-frontend/spec/javascripts/explore/components/AdhocFilterControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/AdhocFilterControl_spec.jsx
index 0922902d9a086..462b651b13f31 100644
--- a/superset-frontend/spec/javascripts/explore/components/AdhocFilterControl_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/AdhocFilterControl_spec.jsx
@@ -20,16 +20,16 @@
 import React from 'react';
 import sinon from 'sinon';
 import { shallow } from 'enzyme';
+import { supersetTheme } from '@superset-ui/core';
 
 import AdhocFilter, {
   EXPRESSION_TYPES,
   CLAUSES,
 } from 'src/explore/AdhocFilter';
 import AdhocFilterControl from 'src/explore/components/controls/AdhocFilterControl';
+import { LabelsContainer } from 'src/explore/components/OptionControls';
 import AdhocMetric from 'src/explore/AdhocMetric';
 import { AGGREGATES, OPERATORS } from 'src/explore/constants';
-import { supersetTheme } from '@superset-ui/core';
-import { LabelsContainer } from '../../../../src/explore/components/OptionControls';
 
 const simpleAdhocFilter = new AdhocFilter({
   expressionType: EXPRESSION_TYPES.SIMPLE,
diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx
index 7fad83be234e3..c841a518e577a 100644
--- a/superset-frontend/src/components/Icon/index.tsx
+++ b/superset-frontend/src/components/Icon/index.tsx
@@ -81,7 +81,7 @@ import { ReactComponent as FilterIcon } from 'images/icons/filter.svg';
 import { ReactComponent as FilterSmallIcon } from 'images/icons/filter_small.svg';
 import { ReactComponent as FolderIcon } from 'images/icons/folder.svg';
 import { ReactComponent as FullIcon } from 'images/icons/full.svg';
-import { ReactComponent as FunctionIcon } from 'images/icons/fx.svg';
+import { ReactComponent as FunctionIcon } from 'images/icons/function_x.svg';
 import { ReactComponent as GearIcon } from 'images/icons/gear.svg';
 import { ReactComponent as GridIcon } from 'images/icons/grid.svg';
 import { ReactComponent as ImageIcon } from 'images/icons/image.svg';
diff --git a/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx b/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx
index 695d417d1e5ef..613c7f769c52d 100644
--- a/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx
+++ b/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx
@@ -132,6 +132,7 @@ class AdhocFilterControl extends React.Component {
                     datasource={this.props.datasource}
                     partitionColumn={partitionColumn}
                     onRemoveFilter={() => this.onRemoveFilter(index)}
+                    key={index}
                   />
                 );
               }