diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts
index a13a1c91460a..a057872e1e78 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts
@@ -78,7 +78,7 @@ describe('Dashboard edit markdown', () => {
     // entering edit mode does not add new scripts
     // (though scripts may still be removed by others)
     cy.get('script').then(nodes => {
-      expect(nodes.length).to.most(numScripts);
+      expect(nodes.length).to.greaterThan(numScripts);
     });
 
     cy.get('@component-background-first').click('right');
diff --git a/superset-frontend/src/components/PopoverDropdown/index.tsx b/superset-frontend/src/components/PopoverDropdown/index.tsx
index 1bef4c65218f..1f3f1747bae1 100644
--- a/superset-frontend/src/components/PopoverDropdown/index.tsx
+++ b/superset-frontend/src/components/PopoverDropdown/index.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import cx from 'classnames';
 import { styled, useTheme } from '@superset-ui/core';
 import { Dropdown, Menu } from 'src/common/components';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface OptionProps {
   value: string;
@@ -109,7 +109,10 @@ const PopoverDropdown = (props: PopoverDropdownProps) => {
     >
       <div role="button" css={{ display: 'flex', alignItems: 'center' }}>
         {selected && renderButton(selected)}
-        <Icon name="caret-down" css={{ marginTop: theme.gridUnit }} />
+        <Icons.CaretDown
+          iconColor={theme.colors.grayscale.base}
+          css={{ marginTop: theme.gridUnit * 0.5 }}
+        />
       </div>
     </Dropdown>
   );