diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 0d41f0ca58..a1ba49f580 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -196,7 +196,8 @@ export const EntityDisplayName: (props: EntityDisplayNameProps) => JSX.Element;
 // @public
 export type EntityDisplayNameProps = {
   entityRef: Entity | CompoundEntityRef | string;
-  variant?: 'simple' | string;
+  noIcon?: boolean;
+  noTooltip?: boolean;
   defaultKind?: string;
   defaultNamespace?: string;
 };
diff --git a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
index 735828b18f..6bdbe83a84 100644
--- a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
+++ b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
@@ -49,7 +49,8 @@ const useStyles = makeStyles(
  */
 export type EntityDisplayNameProps = {
   entityRef: Entity | CompoundEntityRef | string;
-  variant?: 'simple' | string;
+  noIcon?: boolean;
+  noTooltip?: boolean;
   defaultKind?: string;
   defaultNamespace?: string;
 };
@@ -62,7 +63,7 @@ export type EntityDisplayNameProps = {
 export const EntityDisplayName = (
   props: EntityDisplayNameProps,
 ): JSX.Element => {
-  const { entityRef, variant, defaultKind, defaultNamespace } = props;
+  const { entityRef, noIcon, noTooltip, defaultKind, defaultNamespace } = props;
 
   const classes = useStyles();
   const { primaryTitle, secondaryTitle, Icon } = useEntityPresentation(
@@ -77,7 +78,7 @@ export const EntityDisplayName = (
   content = (
     <Box component="span" className={classes.root}>
       {content}
-      {Icon && variant !== 'simple' ? (
+      {Icon && !noIcon ? (
         <Box component="span" className={classes.icon}>
           <Icon fontSize="inherit" />
         </Box>
@@ -86,7 +87,7 @@ export const EntityDisplayName = (
   );
 
   // Optionally, a tooltip as the outermost layer
-  if (secondaryTitle) {
+  if (secondaryTitle && !noTooltip) {
     content = (
       <Tooltip enterDelay={1500} title={secondaryTitle}>
         {content}
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
index 71c6bcc860..d253756411 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
@@ -79,11 +79,7 @@ function EntityLayoutTitle(props: {
         whiteSpace="nowrap"
         overflow="hidden"
       >
-        {entity ? (
-          <EntityDisplayName entityRef={entity} variant="simple" />
-        ) : (
-          title
-        )}
+        {entity ? <EntityDisplayName entityRef={entity} noIcon /> : title}
       </Box>
       {entity && <FavoriteEntity entity={entity} />}
     </Box>