diff --git a/apps/app/components/core/board-view/single-board.tsx b/apps/app/components/core/board-view/single-board.tsx
index 9cfe9c937..5701f4c58 100644
--- a/apps/app/components/core/board-view/single-board.tsx
+++ b/apps/app/components/core/board-view/single-board.tsx
@@ -60,6 +60,10 @@ export const SingleBoard: React.FC<Props> = ({
 
   const [properties] = useIssuesProperties(workspaceSlug as string, projectId as string);
 
+  // Check if it has at least 4 tickets since it is enough to accommodate the Calendar height
+  const issuesLength = groupedByIssues?.[groupTitle].length;
+  const hasMinimumNumberOfCards = issuesLength ? issuesLength >= 4 : false;
+
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer || isCompleted;
 
   return (
@@ -103,7 +107,11 @@ export const SingleBoard: React.FC<Props> = ({
                   </div>
                 </>
               )}
-              <div className="pt-3 overflow-hidden overflow-y-scroll">
+              <div
+                className={`pt-3 ${
+                  hasMinimumNumberOfCards ? "overflow-hidden overflow-y-scroll" : ""
+                } `}
+              >
                 {groupedByIssues?.[groupTitle].map((issue, index) => (
                   <Draggable
                     key={issue.id}
diff --git a/apps/app/components/core/filters/issues-view-filter.tsx b/apps/app/components/core/filters/issues-view-filter.tsx
index 1c6a63385..a0036325e 100644
--- a/apps/app/components/core/filters/issues-view-filter.tsx
+++ b/apps/app/components/core/filters/issues-view-filter.tsx
@@ -11,7 +11,7 @@ import useEstimateOption from "hooks/use-estimate-option";
 // components
 import { SelectFilters } from "components/views";
 // ui
-import { CustomMenu, Icon, ToggleSwitch } from "components/ui";
+import { CustomMenu, Icon, ToggleSwitch, Tooltip } from "components/ui";
 // icons
 import {
   ChevronDownIcon,
@@ -82,18 +82,25 @@ export const IssuesFilterView: React.FC = () => {
       {!isArchivedIssues && (
         <div className="flex items-center gap-x-1">
           {issueViewOptions.map((option) => (
-            <button
+            <Tooltip
               key={option.type}
-              type="button"
-              className={`grid h-7 w-7 place-items-center rounded p-1 outline-none hover:bg-custom-sidebar-background-80 duration-300 ${
-                issueView === option.type
-                  ? "bg-custom-sidebar-background-80"
-                  : "text-custom-sidebar-text-200"
-              }`}
-              onClick={() => setIssueView(option.type)}
+              tooltipContent={
+                <span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} View</span>
+              }
+              position="bottom"
             >
-              {option.icon}
-            </button>
+              <button
+                type="button"
+                className={`grid h-7 w-7 place-items-center rounded p-1 outline-none hover:bg-custom-sidebar-background-80 duration-300 ${
+                  issueView === option.type
+                    ? "bg-custom-sidebar-background-80"
+                    : "text-custom-sidebar-text-200"
+                }`}
+                onClick={() => setIssueView(option.type)}
+              >
+                {option.icon}
+              </button>
+            </Tooltip>
           ))}
         </div>
       )}
diff --git a/apps/app/components/issues/attachments.tsx b/apps/app/components/issues/attachments.tsx
index 6d56264e5..95bd3488d 100644
--- a/apps/app/components/issues/attachments.tsx
+++ b/apps/app/components/issues/attachments.tsx
@@ -69,13 +69,12 @@ export const IssueAttachments = () => {
                   <div className="h-7 w-7">{getFileIcon(getFileExtension(file.asset))}</div>
                   <div className="flex flex-col gap-1">
                     <div className="flex items-center gap-2">
-                      <Tooltip theme="dark" tooltipContent={getFileName(file.attributes.name)}>
+                      <Tooltip tooltipContent={getFileName(file.attributes.name)}>
                         <span className="text-sm">
                           {truncateText(`${getFileName(file.attributes.name)}`, 10)}
                         </span>
                       </Tooltip>
                       <Tooltip
-                        theme="dark"
                         tooltipContent={`${
                           people?.find((person) => person.member.id === file.updated_by)?.member
                             .first_name ?? ""
diff --git a/apps/app/components/pages/single-page-detailed-item.tsx b/apps/app/components/pages/single-page-detailed-item.tsx
index fcd6ca54f..2ae792940 100644
--- a/apps/app/components/pages/single-page-detailed-item.tsx
+++ b/apps/app/components/pages/single-page-detailed-item.tsx
@@ -141,7 +141,6 @@ export const SinglePageDetailedItem: React.FC<TSingleStatProps> = ({
                       ? "This page is only visible to you."
                       : "This page can be viewed by anyone in the project."
                   }`}
-                  theme="dark"
                 >
                   <button
                     type="button"
@@ -160,7 +159,6 @@ export const SinglePageDetailedItem: React.FC<TSingleStatProps> = ({
                 </Tooltip>
               )}
               <Tooltip
-                theme="dark"
                 position="top-right"
                 tooltipContent={`Created by ${
                   people?.find((person) => person.member.id === page.created_by)?.member
diff --git a/apps/app/components/pages/single-page-list-item.tsx b/apps/app/components/pages/single-page-list-item.tsx
index 1832aa20d..30199b27f 100644
--- a/apps/app/components/pages/single-page-list-item.tsx
+++ b/apps/app/components/pages/single-page-list-item.tsx
@@ -140,7 +140,6 @@ export const SinglePageListItem: React.FC<TSingleStatProps> = ({
                           ? "This page is only visible to you."
                           : "This page can be viewed by anyone in the project."
                       }`}
-                      theme="dark"
                     >
                       <button
                         type="button"
@@ -159,7 +158,6 @@ export const SinglePageListItem: React.FC<TSingleStatProps> = ({
                     </Tooltip>
                   )}
                   <Tooltip
-                    theme="dark"
                     position="top-right"
                     tooltipContent={`Created by ${
                       people?.find((person) => person.member.id === page.created_by)?.member
diff --git a/apps/app/components/project/delete-project-modal.tsx b/apps/app/components/project/delete-project-modal.tsx
index ae8be4684..d0474dddb 100644
--- a/apps/app/components/project/delete-project-modal.tsx
+++ b/apps/app/components/project/delete-project-modal.tsx
@@ -71,13 +71,6 @@ export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
 
     setIsDeleteLoading(true);
 
-    if (data.is_favorite)
-      mutate<IProject[]>(
-        PROJECTS_LIST(workspaceSlug as string, { is_favorite: true }),
-        (prevData) => prevData?.filter((project: IProject) => project.id !== data.id),
-        false
-      );
-
     mutate<IProject[]>(
       PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
       (prevData) => prevData?.filter((project: IProject) => project.id !== data.id),
diff --git a/apps/app/components/project/sidebar-list.tsx b/apps/app/components/project/sidebar-list.tsx
index c8dc567e7..477cb49b1 100644
--- a/apps/app/components/project/sidebar-list.tsx
+++ b/apps/app/components/project/sidebar-list.tsx
@@ -29,8 +29,8 @@ export const ProjectSidebarList: FC = () => {
   const { collapsed: sidebarCollapse } = useTheme();
   const { setToastAlert } = useToast();
 
-  const { projects: favoriteProjects } = useProjects(true);
   const { projects: allProjects } = useProjects();
+  const favoriteProjects = allProjects?.filter((p) => p.is_favorite);
 
   const handleDeleteProject = (project: IProject) => {
     setProjectToDelete(project);
diff --git a/apps/app/components/project/single-project-card.tsx b/apps/app/components/project/single-project-card.tsx
index f21ef3014..b2bd7e4a5 100644
--- a/apps/app/components/project/single-project-card.tsx
+++ b/apps/app/components/project/single-project-card.tsx
@@ -55,11 +55,6 @@ export const SingleProjectCard: React.FC<ProjectCardProps> = ({
   const handleAddToFavorites = () => {
     if (!workspaceSlug) return;
 
-    mutate<IProject[]>(
-      PROJECTS_LIST(workspaceSlug as string, { is_favorite: true }),
-      (prevData) => [...(prevData ?? []), { ...project, is_favorite: true }],
-      false
-    );
     mutate<IProject[]>(
       PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
       (prevData) =>
@@ -90,11 +85,6 @@ export const SingleProjectCard: React.FC<ProjectCardProps> = ({
   const handleRemoveFromFavorites = () => {
     if (!workspaceSlug || !project) return;
 
-    mutate<IProject[]>(
-      PROJECTS_LIST(workspaceSlug as string, { is_favorite: true }),
-      (prevData) => (prevData ?? []).filter((p) => p.id !== project.id),
-      false
-    );
     mutate<IProject[]>(
       PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
       (prevData) =>
@@ -203,7 +193,6 @@ export const SingleProjectCard: React.FC<ProjectCardProps> = ({
               <Tooltip
                 tooltipContent={`Created at ${renderShortDateWithYearFormat(project.created_at)}`}
                 position="bottom"
-                theme="dark"
               >
                 <div className="flex cursor-default items-center gap-1.5 text-xs">
                   <CalendarDaysIcon className="h-4 w-4" />
diff --git a/apps/app/components/project/single-sidebar-project.tsx b/apps/app/components/project/single-sidebar-project.tsx
index ec1ed0908..06b030ccb 100644
--- a/apps/app/components/project/single-sidebar-project.tsx
+++ b/apps/app/components/project/single-sidebar-project.tsx
@@ -77,11 +77,6 @@ export const SingleSidebarProject: React.FC<Props> = ({
   const handleAddToFavorites = () => {
     if (!workspaceSlug) return;
 
-    mutate<IProject[]>(
-      PROJECTS_LIST(workspaceSlug as string, { is_favorite: true }),
-      (prevData) => [...(prevData ?? []), { ...project, is_favorite: true }],
-      false
-    );
     mutate<IProject[]>(
       PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
       (prevData) =>
@@ -105,11 +100,6 @@ export const SingleSidebarProject: React.FC<Props> = ({
   const handleRemoveFromFavorites = () => {
     if (!workspaceSlug) return;
 
-    mutate<IProject[]>(
-      PROJECTS_LIST(workspaceSlug as string, { is_favorite: true }),
-      (prevData) => (prevData ?? []).filter((p) => p.id !== project.id),
-      false
-    );
     mutate<IProject[]>(
       PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
       (prevData) =>
diff --git a/apps/app/components/ui/tooltip.tsx b/apps/app/components/ui/tooltip.tsx
index 271dfcd50..fe8785f61 100644
--- a/apps/app/components/ui/tooltip.tsx
+++ b/apps/app/components/ui/tooltip.tsx
@@ -1,11 +1,13 @@
 import React from "react";
 
+// next-themes
+import { useTheme } from "next-themes";
+// tooltip2
 import { Tooltip2 } from "@blueprintjs/popover2";
 
 type Props = {
   tooltipHeading?: string;
-  tooltipContent: string | JSX.Element;
-  triangle?: boolean;
+  tooltipContent: string | React.ReactNode;
   position?:
     | "top"
     | "right"
@@ -25,7 +27,8 @@ type Props = {
   children: JSX.Element;
   disabled?: boolean;
   className?: string;
-  theme?: "light" | "dark";
+  openDelay?: number;
+  closeDelay?: number;
 };
 
 export const Tooltip: React.FC<Props> = ({
@@ -35,24 +38,40 @@ export const Tooltip: React.FC<Props> = ({
   children,
   disabled = false,
   className = "",
-  theme = "light",
-  triangle,
-}) => (
-  <Tooltip2
-    disabled={disabled}
-    content={
-      <div
-        className={`${className} relative z-50 flex max-w-[600px] flex-col items-start justify-center gap-1 rounded-md p-2 text-left text-xs shadow-md ${
-          theme === "light" ? "text-custom-text-200 bg-custom-background-80" : "bg-black text-white"
-        }`}
-      >
-        {tooltipHeading && <h5 className="font-medium">{tooltipHeading}</h5>}
-        {tooltipContent}
-      </div>
-    }
-    position={position}
-    renderTarget={({ isOpen: isTooltipOpen, ref: eleReference, ...tooltipProps }) =>
-      React.cloneElement(children, { ref: eleReference, ...tooltipProps, ...children.props })
-    }
-  />
-);
+  openDelay = 500,
+  closeDelay,
+}) => {
+  const { theme } = useTheme();
+
+  return (
+    <Tooltip2
+      disabled={disabled}
+      hoverOpenDelay={openDelay}
+      hoverCloseDelay={closeDelay}
+      content={
+        <div
+          className={`relative z-50 max-w-xs gap-1 rounded-md p-2 text-xs shadow-md ${
+            theme === "custom"
+              ? "bg-custom-background-100 text-custom-text-200"
+              : "bg-black text-gray-400"
+          } break-words overflow-hidden ${className}`}
+        >
+          {tooltipHeading && (
+            <h5
+              className={`font-medium ${
+                theme === "custom" ? "text-custom-text-100" : "text-white"
+              }`}
+            >
+              {tooltipHeading}
+            </h5>
+          )}
+          {tooltipContent}
+        </div>
+      }
+      position={position}
+      renderTarget={({ isOpen: isTooltipOpen, ref: eleReference, ...tooltipProps }) =>
+        React.cloneElement(children, { ref: eleReference, ...tooltipProps, ...children.props })
+      }
+    />
+  );
+};
diff --git a/apps/app/components/workspace/activity-graph.tsx b/apps/app/components/workspace/activity-graph.tsx
index c9fecc1cd..95d6d03b3 100644
--- a/apps/app/components/workspace/activity-graph.tsx
+++ b/apps/app/components/workspace/activity-graph.tsx
@@ -110,7 +110,6 @@ export const ActivityGraph: React.FC<Props> = ({ activities }) => {
                   tooltipContent={`${
                     isActive ? isActive.activity_count : 0
                   } activities on ${renderShortDateWithYearFormat(date)}`}
-                  theme="dark"
                 >
                   <div
                     className={`${
diff --git a/apps/app/layouts/app-layout/app-sidebar.tsx b/apps/app/layouts/app-layout/app-sidebar.tsx
index 22f515905..c9d7e5411 100644
--- a/apps/app/layouts/app-layout/app-sidebar.tsx
+++ b/apps/app/layouts/app-layout/app-sidebar.tsx
@@ -20,7 +20,7 @@ const Sidebar: React.FC<SidebarProps> = ({ toggleSidebar, setToggleSidebar }) =>
   return (
     <div
       className={`fixed md:relative inset-y-0 flex flex-col bg-custom-sidebar-background-100 h-full flex-shrink-0 flex-grow-0 border-r border-custom-sidebar-border-100 z-20 duration-300 ${
-        sidebarCollapse ? "" : "md:w-72"
+        sidebarCollapse ? "" : "md:w-[280px]"
       } ${toggleSidebar ? "left-0" : "-left-full md:left-0"}`}
     >
       <div className="flex h-full w-full flex-1 flex-col">
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
index f34689237..36612c92b 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
@@ -482,7 +482,6 @@ const SinglePage: NextPage = () => {
                           ? "This page is only visible to you."
                           : "This page can be viewed by anyone in the project."
                       }`}
-                      theme="dark"
                     >
                       {pageDetails.access ? (
                         <button onClick={() => partialUpdatePage({ access: 0 })} className="z-10">
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx
index a2cb01a55..ca4ac770d 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx
@@ -33,24 +33,24 @@ const AutomationsSettings: NextPage = () => {
   const { projectDetails } = useProjectDetails();
 
   const handleChange = async (formData: Partial<IProject>) => {
-    if (!workspaceSlug || !projectId) return;
+    if (!workspaceSlug || !projectId || !projectDetails) return;
 
     mutate<IProject>(
       PROJECT_DETAILS(projectId as string),
       (prevData) => ({ ...(prevData as IProject), ...formData }),
       false
     );
+
+    mutate<IProject[]>(
+      PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
+      (prevData) =>
+        (prevData ?? []).map((p) => (p.id === projectDetails.id ? { ...p, ...formData } : p)),
+      false
+    );
+
     await projectService
       .updateProject(workspaceSlug as string, projectId as string, formData, user)
-      .then(() => {
-        mutate<IProject[]>(
-          PROJECTS_LIST(workspaceSlug as string),
-          (prevData) =>
-            (prevData ?? []).map((p) => (p.id === projectDetails?.id ? { ...p, ...formData } : p)),
-          false
-        );
-        mutate(PROJECT_DETAILS(projectId as string));
-      })
+      .then(() => {})
       .catch(() => {
         setToastAlert({
           type: "error",
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx
index 540bf2506..897cd12d0 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx
@@ -71,13 +71,6 @@ const ControlSettings: NextPage = () => {
       .then((res) => {
         mutate(PROJECT_DETAILS(projectId as string));
 
-        if (projectDetails.is_favorite)
-          mutate(
-            PROJECTS_LIST(workspaceSlug as string, {
-              is_favorite: true,
-            })
-          );
-
         mutate(
           PROJECTS_LIST(workspaceSlug as string, {
             is_favorite: "all",
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
index 098a4467b..d04adaa0f 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
@@ -99,44 +99,21 @@ const FeaturesSettings: NextPage = () => {
   const handleSubmit = async (formData: Partial<IProject>) => {
     if (!workspaceSlug || !projectId || !projectDetails) return;
 
-    if (projectDetails.is_favorite)
-      mutate<IProject[]>(
-        PROJECTS_LIST(workspaceSlug.toString(), {
-          is_favorite: true,
-        }),
-        (prevData) =>
-          prevData?.map((p) => {
-            if (p.id === projectId)
-              return {
-                ...p,
-                ...formData,
-              };
-
-            return p;
-          }),
-        false
-      );
-
     mutate<IProject[]>(
       PROJECTS_LIST(workspaceSlug.toString(), {
         is_favorite: "all",
       }),
-      (prevData) =>
-        prevData?.map((p) => {
-          if (p.id === projectId)
-            return {
-              ...p,
-              ...formData,
-            };
-
-          return p;
-        }),
+      (prevData) => prevData?.map((p) => (p.id === projectId ? { ...p, ...formData } : p)),
       false
     );
 
     mutate<IProject>(
       PROJECT_DETAILS(projectId as string),
-      (prevData) => ({ ...(prevData as IProject), ...formData }),
+      (prevData) => {
+        if (!prevData) return prevData;
+
+        return { ...prevData, ...formData };
+      },
       false
     );
 
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
index fa4ac01ea..02d63c379 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
@@ -95,13 +95,6 @@ const GeneralSettings: NextPage = () => {
           false
         );
 
-        if (projectDetails.is_favorite)
-          mutate(
-            PROJECTS_LIST(workspaceSlug as string, {
-              is_favorite: true,
-            })
-          );
-
         mutate(
           PROJECTS_LIST(workspaceSlug as string, {
             is_favorite: "all",
diff --git a/apps/app/styles/globals.css b/apps/app/styles/globals.css
index 964d77ca9..ed6316ebd 100644
--- a/apps/app/styles/globals.css
+++ b/apps/app/styles/globals.css
@@ -1,5 +1,5 @@
 @import url("https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@48,400,0,0");
+@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@48,400,0,0&display=swap");
 
 @tailwind base;
 @tailwind components;