diff --git a/packages/core-components/src/components/ProgressBars/Gauge.tsx b/packages/core-components/src/components/ProgressBars/Gauge.tsx
index f71756f946..89e384a452 100644
--- a/packages/core-components/src/components/ProgressBars/Gauge.tsx
+++ b/packages/core-components/src/components/ProgressBars/Gauge.tsx
@@ -16,8 +16,9 @@
 
 import { BackstagePalette, BackstageTheme } from '@backstage/theme';
 import { makeStyles, useTheme } from '@material-ui/core/styles';
+import { isNull } from 'lodash';
 import { Circle } from 'rc-progress';
-import React, { ReactNode, useEffect, useRef, useState } from 'react';
+import React, { ReactNode, useEffect, useState } from 'react';
 
 /** @public */
 export type GaugeClassKey =
@@ -46,7 +47,7 @@ const useStyles = makeStyles<BackstageTheme>(
       fontSize: '100%',
       top: '50%',
       left: '50%',
-      transform: 'translate(-55%, -50%)',
+      transform: 'translate(-50%, -50%)',
       position: 'absolute',
       wordBreak: 'break-all',
       display: 'inline-block',
@@ -119,7 +120,8 @@ export const getProgressColor: GaugePropsGetColor = ({
  */
 
 export function Gauge(props: GaugeProps) {
-  const hoverRef = useRef<HTMLDivElement>(null);
+  // const hoverRef = useRef<HTMLDivElement>(null);
+  const [hoverRef, setHoverRef] = useState<HTMLDivElement | null>(null);
   const { getColor = getProgressColor } = props;
   const classes = useStyles(props);
   const { palette } = useTheme<BackstageTheme>();
@@ -131,13 +133,13 @@ export function Gauge(props: GaugeProps) {
   const asPercentage = fractional ? Math.round(value * max) : value;
   const asActual = max !== 100 ? Math.round(value) : asPercentage;
 
-  const [isHovering, setValue] = useState(false);
-  const handleMouseOver = () => setValue(true);
-  const handleMouseOut = () => setValue(false);
+  const [isHovering, setIsHovering] = useState(false);
+  const handleMouseOver = () => setIsHovering(true);
+  const handleMouseOut = () => setIsHovering(false);
 
   useEffect(() => {
-    const node = hoverRef.current;
-    if (node) {
+    const node = hoverRef;
+    if (node && !isNull(isHovering)) {
       node.addEventListener('mouseenter', handleMouseOver);
       node.addEventListener('mouseleave', handleMouseOut);
 
@@ -147,12 +149,12 @@ export function Gauge(props: GaugeProps) {
       };
     }
     return () => {
-      setValue(false);
+      setIsHovering(false);
     };
   });
 
   return (
-    <div ref={hoverRef} className={classes.root}>
+    <div ref={setHoverRef} className={classes.root}>
       <Circle
         strokeLinecap="butt"
         percent={asPercentage}
diff --git a/packages/core-components/src/layout/InfoCard/InfoCard.tsx b/packages/core-components/src/layout/InfoCard/InfoCard.tsx
index 5c52e28543..256d60cfa2 100644
--- a/packages/core-components/src/layout/InfoCard/InfoCard.tsx
+++ b/packages/core-components/src/layout/InfoCard/InfoCard.tsx
@@ -56,7 +56,7 @@ const useStyles = makeStyles(
     headerAction: {},
     headerContent: {},
     subheader: {
-      float: 'left',
+      display: 'flex',
     },
   }),
   { name: 'BackstageInfoCard' },
@@ -203,7 +203,7 @@ export function InfoCard(props: Props): JSX.Element {
     return (
       <div className={classes.headerSubheader}>
         {subheader && <div className={classes.subheader}>{subheader}</div>}
-        {icon && icon}
+        {icon}
       </div>
     );
   };