diff --git a/src/components/Chart/CustomTooltip.tsx b/src/components/Chart/CustomTooltip.tsx
index 03e678c1df..a6c07ce9f9 100644
--- a/src/components/Chart/CustomTooltip.tsx
+++ b/src/components/Chart/CustomTooltip.tsx
@@ -162,7 +162,7 @@ const renderTooltipItems = (
   let ignoredIndex = 0;
 
   return (
-    <Grid container xs={12} padding={"10px"}>
+    <Grid container padding={"10px"}>
       {renderDate(payload[0])}
       {payload
         .map((item, index) => {
diff --git a/src/components/Chart/ExpandedChart.tsx b/src/components/Chart/ExpandedChart.tsx
index 11c5c7e766..ea652d2025 100644
--- a/src/components/Chart/ExpandedChart.tsx
+++ b/src/components/Chart/ExpandedChart.tsx
@@ -78,9 +78,8 @@ const ExpandedChart = ({
           {subgraphQueryUrl && (
             <Grid item xs textAlign="right" marginRight="15px">
               <Link href={subgraphQueryUrl} target="_blank" rel="noopener noreferrer">
-                <Tooltip message={`Open Subgraph Query`}>
-                  <SvgIcon component={GraphLogo} viewBox="0 0 100 100" style={{ width: "16px", height: "16px" }} />
-                </Tooltip>
+                <Tooltip message={`Open Subgraph Query`} />
+                <SvgIcon component={GraphLogo} viewBox="0 0 100 100" style={{ width: "16px", height: "16px" }} />
               </Link>
             </Grid>
           )}
diff --git a/src/views/TreasuryDashboard/components/Graph/ChartCard.tsx b/src/views/TreasuryDashboard/components/Graph/ChartCard.tsx
index 9e33e4c5bf..4494d4e0f8 100644
--- a/src/views/TreasuryDashboard/components/Graph/ChartCard.tsx
+++ b/src/views/TreasuryDashboard/components/Graph/ChartCard.tsx
@@ -34,22 +34,22 @@ export const ChartCard: React.FC<ChartCardProps> = props => {
               <Grid item>
                 {props.subgraphQueryUrl && (
                   <Link href={props.subgraphQueryUrl} target="_blank" rel="noopener noreferrer">
-                    <Tooltip message={`Open Subgraph Query`}>
-                      <SvgIcon component={GraphLogo} viewBox="0 0 100 100" style={{ width: "16px", height: "16px" }} />
-                    </Tooltip>
+                    <Tooltip message={`Open Subgraph Query`} />
+                    <SvgIcon component={GraphLogo} viewBox="0 0 100 100" style={{ width: "16px", height: "16px" }} />
                   </Link>
                 )}
               </Grid>
               <Grid item>
                 {props.handleOpenExpandedChart && (
-                  <Tooltip message={`Open in Expanded View`}>
+                  <>
+                    <Tooltip message={`Open in Expanded View`} />
                     <SvgIcon
                       component={Fullscreen}
                       color="primary"
                       onClick={props.handleOpenExpandedChart}
                       style={{ fontSize: "1rem", cursor: "pointer" }}
                     />
-                  </Tooltip>
+                  </>
                 )}
               </Grid>
             </Grid>