diff --git a/package-lock.json b/package-lock.json
index cf6c7e3d1e..232fe70262 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5881,7 +5881,7 @@
     },
     "node_modules/dotaconstants": {
       "version": "8.7.0",
-      "resolved": "git+ssh://git@github.com/builder-247/dotaconstants.git#e9e5329896f3b8429583423bbc637dfccf296587",
+      "resolved": "git+ssh://git@github.com/builder-247/dotaconstants.git#8ea494017c5e43c96a7c296ba9aa419a02e402f3",
       "license": "MIT"
     },
     "node_modules/ecdsa-sig-formatter": {
@@ -17285,7 +17285,7 @@
       "integrity": "sha512-arwwgkRRsbTnfkHJWCIkSijmd5BcVwNrBCU2I1QXN1bQ557+/Ikmgs9d6HZnA1QvIlkM6M79SdermOvg9Z01Hw=="
     },
     "dotaconstants": {
-      "version": "git+ssh://git@github.com/builder-247/dotaconstants.git#e9e5329896f3b8429583423bbc637dfccf296587",
+      "version": "git+ssh://git@github.com/builder-247/dotaconstants.git#8ea494017c5e43c96a7c296ba9aa419a02e402f3",
       "from": "dotaconstants@builder-247/dotaconstants#facets"
     },
     "ecdsa-sig-formatter": {
diff --git a/src/components/Visualizations/Table/HeroFacet.jsx b/src/components/Visualizations/Table/HeroFacet.jsx
index 285d9aa2a0..6cfb08c533 100644
--- a/src/components/Visualizations/Table/HeroFacet.jsx
+++ b/src/components/Visualizations/Table/HeroFacet.jsx
@@ -12,7 +12,7 @@ const Facet = styled.div`
     position: absolute;
     bottom: -4px;
     right: 8px;
-    z-index: 2;
+    z-index: 10;
     border-radius: 1px;
 
     & img {
@@ -26,6 +26,7 @@ const Facet = styled.div`
   .facetTooltip {
     display: flex;
     flex-direction: column;
+    z-index: 10;
     max-width: 400px;
 
     & .facetHeader {
@@ -150,12 +151,9 @@ class HeroFacet extends React.Component {
       facet
     } = this.props;
 
-    let selectedFacet = {};
-
-    if (heroID && facet) {
-      selectedFacet = heroAbilities[heroes[heroID].name]?.facets[facet - 1];
-    }
+    if (!(heroID && facet)) return null;
 
+    const selectedFacet = heroAbilities[heroes[heroID].name]?.facets[facet - 1];
     const { color, gradient_id, icon, name } = selectedFacet;
 
     const imageURL = `${config.VITE_IMAGE_CDN}/apps/dota2/images/dota_react/icons/facets/${icon}.png`;
@@ -164,13 +162,9 @@ class HeroFacet extends React.Component {
     return (
       <Facet>
         <div className={`facet ${colorClass}`} data-tip data-for={name}>
-          <img
-            className="facet"
-            src={imageURL}
-            alt=""
-          />
+          <img src={imageURL} alt="" />
           <div className='hero-tooltip'>
-            <ReactTooltip id={selectedFacet.name} effect='solid' place='right'>
+            <ReactTooltip id={name} effect='solid' place='right'>
               <div
                 className={`facetTooltip ${colorClass}`}
                 style={{
diff --git a/src/components/Visualizations/Table/HeroImage.jsx b/src/components/Visualizations/Table/HeroImage.jsx
index 2fb9742ccc..4eef95b04a 100644
--- a/src/components/Visualizations/Table/HeroImage.jsx
+++ b/src/components/Visualizations/Table/HeroImage.jsx
@@ -86,7 +86,6 @@ const Styled = styled.div`
   
   .abandoned {
     position: absolute;
-    right: 7px;
     bottom: 8px;
     height: 15px;
 
@@ -454,7 +453,7 @@ class TableHeroImage extends React.Component {
       party,
       heroName,
       heroID,
-      facet = 2,  // TODO - remove default
+      facet,
       showGuide,
       guideUrl,
       guideType,
@@ -513,13 +512,14 @@ class TableHeroImage extends React.Component {
               {leaverStatus !== undefined && leaverStatus > 1 && (
                 <span
                   className="abandoned"
+                  style={{ right: facet ? '12px' : '7px' }}
                   data-hint={strings[`leaver_status_${leaverStatus}`]}
                   data-hint-position="top"
                 >
                   <img src="/assets/images/dota2/disconnect_icon.png" alt="" />
                 </span>
               )}
-              {(heroID && facet) && <HeroFacet heroID={heroID} facet={facet} />}
+              <HeroFacet heroID={heroID} facet={facet} />
               {playerSlot !== undefined && (
                 <div
                   className="playerSlot"