diff --git a/frontend/src/component/common/Table/cells/FavoriteIconCell/FavoriteIconCell.tsx b/frontend/src/component/common/Table/cells/FavoriteIconCell/FavoriteIconCell.tsx
index 537c9a84ee..ad28a4cd0a 100644
--- a/frontend/src/component/common/Table/cells/FavoriteIconCell/FavoriteIconCell.tsx
+++ b/frontend/src/component/common/Table/cells/FavoriteIconCell/FavoriteIconCell.tsx
@@ -5,49 +5,46 @@ import {
     StarBorder as StarBorderIcon,
 } from '@mui/icons-material';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
-import { TooltipResolver } from 'component/common/TooltipResolver/TooltipResolver';
+
+const StyledCell = styled(Box)(({ theme }) => ({
+    paddingLeft: theme.spacing(1.25),
+}));
+
+const StyledIconButton = styled(IconButton)(({ theme }) => ({
+    color: theme.palette.primary.main,
+    padding: theme.spacing(1.25),
+}));
+
+const StyledIconButtonInactive = styled(StyledIconButton)({
+    opacity: 0,
+});
 
 interface IFavoriteIconCellProps {
     value?: boolean;
     onClick?: () => void;
 }
 
-const InactiveIconButton = styled(IconButton)(({ theme }) => ({
-    color: theme.palette.primary.main,
-    opacity: 0,
-}));
-
 export const FavoriteIconCell: VFC<IFavoriteIconCellProps> = ({
-    value = false,
+    value,
     onClick,
 }) => (
-    <Box sx={{ pl: 1.25, display: 'inline-flex' }}>
+    <StyledCell>
         <ConditionallyRender
-            condition={value}
+            condition={Boolean(value)}
             show={
-                <TooltipResolver title={'Remove from favorites'}>
-                    <IconButton
-                        onClick={onClick}
-                        color="primary"
-                        size="small"
-                        sx={{ padding: 1.25 }}
-                    >
-                        <StarIcon fontSize="small" />
-                    </IconButton>
-                </TooltipResolver>
+                <StyledIconButton onClick={onClick} size="small">
+                    <StarIcon fontSize="small" />
+                </StyledIconButton>
             }
             elseShow={
-                <TooltipResolver title={'Add to favorites'}>
-                    <InactiveIconButton
-                        className="show-row-hover"
-                        onClick={onClick}
-                        size="small"
-                        sx={{ padding: 1.25 }}
-                    >
-                        <StarBorderIcon fontSize="small" />
-                    </InactiveIconButton>
-                </TooltipResolver>
+                <StyledIconButtonInactive
+                    className="show-row-hover"
+                    onClick={onClick}
+                    size="small"
+                >
+                    <StarBorderIcon fontSize="small" />
+                </StyledIconButtonInactive>
             }
         />
-    </Box>
+    </StyledCell>
 );