diff --git a/app/src/@shared/ui-kit/Tooltip/IconTooltip.tsx b/app/src/@shared/ui-kit/Tooltip/IconTooltip.tsx
index 2d78f90e..95713ed6 100644
--- a/app/src/@shared/ui-kit/Tooltip/IconTooltip.tsx
+++ b/app/src/@shared/ui-kit/Tooltip/IconTooltip.tsx
@@ -25,9 +25,26 @@ export const IconTooltip = ({
     text,
   });
 
-  const Icon = type === 'info' ? MdInfo : MdWarning;
-  const iconColor =
-    type === 'info' ? theme.colors.mono.gray500 : theme.colors.semantic.warning;
+  const Icon = (() => {
+    switch (type) {
+      case 'info':
+        return MdInfo;
+      case 'warning':
+        return MdWarning;
+      default:
+        return MdInfo;
+    }
+  })();
+  const iconColor = (() => {
+    switch (type) {
+      case 'info':
+        return theme.colors.mono.gray500;
+      case 'warning':
+        return theme.colors.semantic.warning;
+      default:
+        return theme.colors.mono.gray500;
+    }
+  })();
 
   return (
     <Layout onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
diff --git a/app/src/@shared/ui-kit/Tooltip/Tooltip.tsx b/app/src/@shared/ui-kit/Tooltip/Tooltip.tsx
index 959204a6..6faad0eb 100644
--- a/app/src/@shared/ui-kit/Tooltip/Tooltip.tsx
+++ b/app/src/@shared/ui-kit/Tooltip/Tooltip.tsx
@@ -21,7 +21,7 @@ export const Tooltip = () => {
 
   return (
     <Layout
-      hover={ref ? true : false}
+      hover={ref !== null}
       position={position}
       top={top}
       left={left}
diff --git a/app/src/Profile/dashboard-contents/General/DailyActivities/DailyActivityTable.tsx b/app/src/Profile/dashboard-contents/General/DailyActivities/DailyActivityTable.tsx
index 807fe001..e000a1ed 100644
--- a/app/src/Profile/dashboard-contents/General/DailyActivities/DailyActivityTable.tsx
+++ b/app/src/Profile/dashboard-contents/General/DailyActivities/DailyActivityTable.tsx
@@ -76,7 +76,7 @@ export const DailyActivityTable = ({
 
   return (
     <ScrollXArea ref={scrollAreaRef}>
-      <HStack style={{ marginRight: '5rem' }} ref={tableWithHeaderRef}>
+      <HStack ref={tableWithHeaderRef}>
         <DailyActivityTableDayOfWeekHeader />
         <VStack align="start">
           <DailyActivityTableHeader