diff --git a/src/components/map-projects/MapProjectBreadcrumb.jsx b/src/components/map-projects/MapProjectBreadcrumb.jsx
index 532928a..5da9a5f 100644
--- a/src/components/map-projects/MapProjectBreadcrumb.jsx
+++ b/src/components/map-projects/MapProjectBreadcrumb.jsx
@@ -1,20 +1,51 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import Link from '@mui/material/Link';
-import ChevronRightIcon from '@mui/icons-material/ChevronRight';
+import Button from '@mui/material/Button';
+import OwnerButton from '../common/OwnerButton';
+import OwnerIcon from '../common/OwnerIcon';
+import DotSeparator from '../common/DotSeparator';
 import { hasTermBrowser, toV3URL } from '../../common/utils';
 import { projectCrumbs } from '../../common/breadcrumb';
 
+const LABEL_SX = {
+  maxWidth: '125px',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  fontSize: '14px',
+  whiteSpace: 'nowrap',
+}
+
 const MapProjectBreadcrumb = ({ ownerType, owner }) => {
   const { t } = useTranslation()
   if(!ownerType || !owner)
     return null
-  const [ownerCrumb, projectsCrumb] = projectCrumbs(`/${ownerType}/${owner}/`, hasTermBrowser(), toV3URL)
+  const ownerPath = `/${ownerType}/${owner}/`
+  const [ownerCrumb, projectsCrumb] = projectCrumbs(ownerPath, hasTermBrowser(), toV3URL)
   return (
-    <span aria-label='breadcrumb' style={{display: 'flex', alignItems: 'center', fontSize: '14px', marginRight: '12px', whiteSpace: 'nowrap'}}>
-      {ownerCrumb.href ? <Link href={ownerCrumb.href} underline='hover' color='inherit'>{owner}</Link> : <span>{owner}</span>}
-      <ChevronRightIcon fontSize='inherit' sx={{margin: '0 4px'}} />
-      <Link href={projectsCrumb.href} underline='hover' color='inherit'>{t('map_project.mapping_projects')}</Link>
+    <span aria-label='breadcrumb' style={{display: 'flex', alignItems: 'center', marginRight: '12px', whiteSpace: 'nowrap'}}>
+      {
+        ownerCrumb.href ?
+          <OwnerButton
+            ownerType={ownerType}
+            owner={owner}
+            ownerURL={ownerPath}
+            sx={{
+              '.owner-button-label': LABEL_SX,
+              '.MuiButton-startIcon': {fontSize: '18px'},
+            }}
+          /> :
+          <span style={{display: 'flex', alignItems: 'center', padding: '4px', fontSize: '14px', lineHeight: 1.75}}>
+            <OwnerIcon noTooltip ownerType={ownerType} color='secondary' style={{marginRight: '8px', width: '0.8em', fontSize: '18px', flexShrink: 0}} />
+            <span style={LABEL_SX}>{owner}</span>
+          </span>
+      }
+      <DotSeparator />
+      <Button
+        href={projectsCrumb.href}
+        sx={{textTransform: 'none', color: 'inherit', padding: '4px', minWidth: 'auto', fontSize: '14px', '&:hover': {background: 'transparent', textDecoration: 'underline'}}}
+      >
+        {t('map_project.mapping_projects')}
+      </Button>
     </span>
   )
 }