diff --git a/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx b/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx
new file mode 100644
index 0000000000..bb3a6c056c
--- /dev/null
+++ b/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx
@@ -0,0 +1,67 @@
+/**
+ * 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 { t } from '@superset-ui/translation';
+import { supersetTheme } from '@superset-ui/style';
+import { Tooltip, OverlayTrigger } from 'react-bootstrap';
+import { kebabCase } from 'lodash';
+
+const tooltipStyle: React.CSSProperties = { wordWrap: 'break-word' };
+
+interface CertifiedIconWithTooltipProps {
+  certifiedBy?: string | null;
+  details?: string | null;
+  metricName: string;
+}
+
+function CertifiedIconWithTooltip({
+  certifiedBy,
+  details,
+  metricName,
+}: CertifiedIconWithTooltipProps) {
+  return (
+    <OverlayTrigger
+      placement="top"
+      overlay={
+        <Tooltip id={`${kebabCase(metricName)}-tooltip`} style={tooltipStyle}>
+          {certifiedBy && <div>{t('Certified by %s', certifiedBy)}</div>}
+          <div>{details}</div>
+        </Tooltip>
+      }
+    >
+      {/* TODO: move Icons to superset-ui to remove duplicated icon code here */}
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        enableBackground="new 0 0 24 24"
+        height="16"
+        viewBox="0 0 24 24"
+        width="16"
+      >
+        <g>
+          <path
+            fill={supersetTheme.colors.primary.base}
+            d="M23,12l-2.44-2.79l0.34-3.69l-3.61-0.82L15.4,1.5L12,2.96L8.6,1.5L6.71,4.69L3.1,5.5L3.44,9.2L1,12l2.44,2.79l-0.34,3.7 l3.61,0.82L8.6,22.5l3.4-1.47l3.4,1.46l1.89-3.19l3.61-0.82l-0.34-3.69L23,12z M9.38,16.01L7,13.61c-0.39-0.39-0.39-1.02,0-1.41 l0.07-0.07c0.39-0.39,1.03-0.39,1.42,0l1.61,1.62l5.15-5.16c0.39-0.39,1.03-0.39,1.42,0l0.07,0.07c0.39,0.39,0.39,1.02,0,1.41 l-5.92,5.94C10.41,16.4,9.78,16.4,9.38,16.01z"
+          />
+        </g>
+      </svg>
+    </OverlayTrigger>
+  );
+}
+
+export default CertifiedIconWithTooltip;
diff --git a/packages/superset-ui-chart-controls/src/components/MetricOption.tsx b/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
index df00f24db4..efddde0afd 100644
--- a/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
+++ b/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
@@ -16,21 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/* eslint-disable camelcase */
 import React from 'react';
+import styled from '@superset-ui/style';
 import InfoTooltipWithTrigger from './InfoTooltipWithTrigger';
 import { ColumnTypeLabel } from './ColumnTypeLabel';
+import CertifiedIconWithTooltip from './CertifiedIconWithTooltip';
+
+const FlexRowContainer = styled.div`
+  align-items: center;
+  display: flex;
+
+  > svg {
+    margin-right: ${({ theme }) => theme.gridUnit}px;
+  }
+`;
 
 export interface MetricOptionProps {
   metric: {
-    // eslint-disable-next-line camelcase
     verbose_name: string;
-    // eslint-disable-next-line camelcase
     metric_name: string;
     label: string;
     description: string;
-    // eslint-disable-next-line camelcase
     warning_text: string;
     expression: string;
+    is_certified?: boolean;
+    certified_by?: string | null;
+    certification_details?: string | null;
   };
   openInNewWindow: boolean;
   showFormula: boolean;
@@ -54,8 +66,15 @@ export function MetricOption({
     verbose
   );
   return (
-    <div className="metric-option">
+    <FlexRowContainer className="metric-option">
       {showType && <ColumnTypeLabel type="expression" />}
+      {metric.is_certified && (
+        <CertifiedIconWithTooltip
+          metricName={metric.metric_name}
+          certifiedBy={metric.certified_by}
+          details={metric.certification_details}
+        />
+      )}
       <span className="option-label">{link}</span>
       {metric.description && (
         <InfoTooltipWithTrigger
@@ -81,6 +100,6 @@ export function MetricOption({
           label={`warn-${metric.metric_name}`}
         />
       )}
-    </div>
+    </FlexRowContainer>
   );
 }