diff --git a/superset/assets/package.json b/superset/assets/package.json
index bdd888067f24d..f3f2564aa479f 100644
--- a/superset/assets/package.json
+++ b/superset/assets/package.json
@@ -227,7 +227,8 @@
   },
   "stylelint": {
     "rules": {
-      "block-opening-brace-space-before": "always"
+      "block-opening-brace-space-before": "always",
+      "no-missing-end-of-source-newline": "never"
     }
   }
 }
diff --git a/superset/assets/src/components/FilterEditIcon.jsx b/superset/assets/src/components/FilterEditIcon.jsx
deleted file mode 100644
index 1daa89524375d..0000000000000
--- a/superset/assets/src/components/FilterEditIcon.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import './FilterEditIcon.less';
-
-const propTypes = {
-  clickIconHandler: PropTypes.func,
-};
-
-export default function FilterEditIcon({ clickIconHandler = () => {} }) {
-  return (
-    <svg
-      width="12"
-      height="12"
-      onClick={clickIconHandler}
-      className="filter-edit"
-      viewBox="0 0 12 12"
-    >
-      <path d="M11.8049 1.75476C12.0649 2.01472 12.0649 2.43466 11.8049 2.69463L10.5851 3.91446L8.08547 1.4148L9.3053 0.194973C9.56526 -0.064991 9.9852 -0.064991 10.2452 0.194973L11.8049 1.75476ZM0 12V9.50035L7.37231 2.12804L9.87196 4.62769L2.49965 12H0Z" />
-    </svg>
-  );
-}
-
-FilterEditIcon.propTypes = propTypes;
diff --git a/superset/assets/src/components/FilterEditIcon.less b/superset/assets/src/components/FilterEditIcon.less
deleted file mode 100644
index dd8195c41c5e0..0000000000000
--- a/superset/assets/src/components/FilterEditIcon.less
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@import "../../stylesheets/less/variables.less";
-
-.filter-edit {
-  cursor: pointer;
-  path {
-    fill: @lightest;
-  }
-}
diff --git a/superset/assets/src/dashboard/components/FilterIndicatorTooltip.jsx b/superset/assets/src/dashboard/components/FilterIndicatorTooltip.jsx
index 6aab00d9073ab..93e42fbe5b447 100644
--- a/superset/assets/src/dashboard/components/FilterIndicatorTooltip.jsx
+++ b/superset/assets/src/dashboard/components/FilterIndicatorTooltip.jsx
@@ -21,8 +21,6 @@ import PropTypes from 'prop-types';
 import { t } from '@superset-ui/translation';
 import { isEmpty } from 'lodash';
 
-import FilterEditIcon from '../../components/FilterEditIcon';
-
 const propTypes = {
   label: PropTypes.string.isRequired,
   values: PropTypes.array.isRequired,
@@ -48,7 +46,12 @@ export default function FilterIndicatorTooltip({
       </div>
 
       {clickIconHandler && (
-        <FilterEditIcon clickIconHandler={clickIconHandler} />
+        <i
+          className="fa fa-pencil filter-edit"
+          onClick={clickIconHandler}
+          role="button"
+          tabIndex="0"
+        />
       )}
     </div>
   );
diff --git a/superset/assets/src/dashboard/stylesheets/filter-indicator-tooltip.less b/superset/assets/src/dashboard/stylesheets/filter-indicator-tooltip.less
index bc8473ecda1a7..7048b20a15832 100644
--- a/superset/assets/src/dashboard/stylesheets/filter-indicator-tooltip.less
+++ b/superset/assets/src/dashboard/stylesheets/filter-indicator-tooltip.less
@@ -57,6 +57,7 @@
   }
 
   .filter-edit {
+    cursor: pointer;
     position: absolute;
     top: 4px;
     right: 0;