diff --git a/web/components/core/views/all-views.tsx b/web/components/core/views/all-views.tsx
index e8478e71a..c5fcc7300 100644
--- a/web/components/core/views/all-views.tsx
+++ b/web/components/core/views/all-views.tsx
@@ -6,7 +6,7 @@ import useSWR from "swr";
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
 // components
-import { CalendarLayout, GanttLayout, KanBanLayout, SpreadsheetLayout } from "components/issues";
+import { AppliedFiltersList, CalendarLayout, GanttLayout, KanBanLayout, SpreadsheetLayout } from "components/issues";
 
 export const AllViews: React.FC = observer(() => {
   const router = useRouter();
@@ -34,7 +34,8 @@ export const AllViews: React.FC = observer(() => {
   const activeLayout = issueFilterStore.userDisplayFilters.layout;
 
   return (
-    <div className="relative w-full h-full overflow-auto">
+    <div className="relative w-full h-full flex flex-col overflow-auto">
+      <AppliedFiltersList />
       {activeLayout === "kanban" ? (
         <KanBanLayout />
       ) : activeLayout === "calendar" ? (
diff --git a/web/components/issue-layouts/root.tsx b/web/components/issue-layouts/root.tsx
index 38029c633..90e1394d4 100644
--- a/web/components/issue-layouts/root.tsx
+++ b/web/components/issue-layouts/root.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 // components
-import { LayoutSelection } from "../issues/issue-layouts/header/layout-selection";
-import { IssueDropdown } from "../issues/issue-layouts/header/helpers/dropdown";
-import { FilterSelection } from "../issues/issue-layouts/header/filters/filters-selection";
-import { DisplayFiltersSelection } from "../issues/issue-layouts/header/display-filters";
+import { LayoutSelection } from "../issues/issue-layouts/filters/header/layout-selection";
+import { IssueDropdown } from "../issues/issue-layouts/filters/header/helpers/dropdown";
+import { FilterSelection } from "../issues/issue-layouts/filters/header/filters/filters-selection";
+import { DisplayFiltersSelection } from "../issues/issue-layouts/filters/header/display-filters";
 
 import { FilterPreview } from "./filters-preview";
 
diff --git a/web/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsx b/web/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsx
index a6e410e09..2b6c43b25 100644
--- a/web/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsx
+++ b/web/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsx
@@ -96,9 +96,7 @@ export const CalendarMonthsDropdown: React.FC = observer(() => {
                     <button
                       key={month.shortTitle}
                       type="button"
-                      className={`text-xs hover:bg-custom-background-80 rounded py-0.5 ${
-                        activeMonthDate.getMonth() === index ? "bg-custom-background-80" : ""
-                      }`}
+                      className="text-xs hover:bg-custom-background-80 rounded py-0.5"
                       onClick={() => {
                         const newDate = new Date(activeMonthDate.getFullYear(), index, 1);
                         handleDateChange(newDate);
diff --git a/web/components/issues/issue-layouts/calendar/issue-blocks.tsx b/web/components/issues/issue-layouts/calendar/issue-blocks.tsx
index 2205ce8d8..915795eba 100644
--- a/web/components/issues/issue-layouts/calendar/issue-blocks.tsx
+++ b/web/components/issues/issue-layouts/calendar/issue-blocks.tsx
@@ -21,8 +21,10 @@ export const CalendarIssueBlocks: React.FC<Props> = observer((props) => {
           {(provided, snapshot) => (
             <Link href={`/${workspaceSlug?.toString()}/projects/${issue.project}/issues/${issue.id}`}>
               <a
-                className={`h-8 w-full shadow-custom-shadow-2xs rounded py-1.5 px-1 flex items-center gap-1.5 border-[0.5px] border-custom-border-200 ${
-                  snapshot.isDragging ? "shadow-custom-shadow-rg bg-custom-background-90" : "bg-custom-background-100"
+                className={`h-8 w-full shadow-custom-shadow-2xs rounded py-1.5 px-1 flex items-center gap-1.5 border-[0.5px] border-custom-border-100 ${
+                  snapshot.isDragging
+                    ? "shadow-custom-shadow-rg bg-custom-background-90"
+                    : "bg-custom-background-100 hover:bg-custom-background-90"
                 }`}
                 {...provided.draggableProps}
                 {...provided.dragHandleProps}
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/date.tsx b/web/components/issues/issue-layouts/filters/applied-filters/date.tsx
new file mode 100644
index 000000000..a94be20a6
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/date.tsx
@@ -0,0 +1,54 @@
+import { observer } from "mobx-react-lite";
+
+// icons
+import { X } from "lucide-react";
+// helpers
+import { renderLongDateFormat } from "helpers/date-time.helper";
+import { capitalizeFirstLetter } from "helpers/string.helper";
+// constants
+import { DATE_FILTER_OPTIONS } from "constants/filters";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  values: string[];
+};
+
+export const AppliedDateFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, values } = props;
+
+  const getDateLabel = (value: string): string => {
+    let dateLabel = "";
+
+    const dateDetails = DATE_FILTER_OPTIONS.find((d) => d.value === value);
+
+    if (dateDetails) dateLabel = dateDetails.name;
+    else {
+      const dateParts = value.split(";");
+
+      if (dateParts.length === 2) {
+        const [date, time] = dateParts;
+
+        dateLabel = `${capitalizeFirstLetter(time)} ${renderLongDateFormat(date)}`;
+      }
+    }
+
+    return dateLabel;
+  };
+
+  return (
+    <div className="flex items-center gap-1 flex-wrap">
+      {values.map((date) => (
+        <div key={date} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
+          <span className="normal-case">{getDateLabel(date)}</span>
+          <button
+            type="button"
+            className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+            onClick={() => handleRemove(date)}
+          >
+            <X size={10} strokeWidth={2} />
+          </button>
+        </div>
+      ))}
+    </div>
+  );
+});
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx b/web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
new file mode 100644
index 000000000..1a103f8c7
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
@@ -0,0 +1,141 @@
+import { useRouter } from "next/router";
+import { observer } from "mobx-react-lite";
+
+// mobx store
+import { useMobxStore } from "lib/mobx/store-provider";
+// components
+import {
+  AppliedDateFilters,
+  AppliedLabelsFilters,
+  AppliedMembersFilters,
+  AppliedPriorityFilters,
+  AppliedStateFilters,
+  AppliedStateGroupFilters,
+} from "components/issues";
+// icons
+import { X } from "lucide-react";
+// helpers
+import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
+// types
+import { IIssueFilterOptions } from "types";
+
+export const AppliedFiltersList: React.FC = observer(() => {
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const { issueFilter: issueFilterStore, project: projectStore } = useMobxStore();
+
+  const userFilters = issueFilterStore.userFilters;
+
+  // filters whose value not null or empty array
+  const appliedFilters: IIssueFilterOptions = {};
+  Object.entries(userFilters).forEach(([key, value]) => {
+    if (!value) return;
+
+    if (Array.isArray(value) && value.length === 0) return;
+
+    appliedFilters[key as keyof IIssueFilterOptions] = value;
+  });
+
+  const handleRemoveFilter = (key: keyof IIssueFilterOptions, value: string | null) => {
+    if (!workspaceSlug || !projectId) return;
+
+    // remove all values of the key if value is null
+    if (!value) {
+      issueFilterStore.updateUserFilters(workspaceSlug.toString(), projectId.toString(), {
+        filters: {
+          [key]: null,
+        },
+      });
+      return;
+    }
+
+    // remove the passed value from the key
+    let newValues = issueFilterStore.userFilters?.[key] ?? [];
+    newValues = newValues.filter((val) => val !== value);
+
+    issueFilterStore.updateUserFilters(workspaceSlug.toString(), projectId.toString(), {
+      filters: {
+        [key]: newValues,
+      },
+    });
+  };
+
+  const handleClearAllFilters = () => {
+    if (!workspaceSlug || !projectId) return;
+
+    const newFilters: IIssueFilterOptions = {};
+    Object.keys(userFilters).forEach((key) => {
+      newFilters[key as keyof IIssueFilterOptions] = null;
+    });
+
+    issueFilterStore.updateUserFilters(workspaceSlug.toString(), projectId.toString(), {
+      filters: { ...newFilters },
+    });
+  };
+
+  // return if no filters are applied
+  if (Object.keys(appliedFilters).length === 0) return null;
+
+  return (
+    <div className="flex items-stretch gap-2 flex-wrap bg-custom-background-100 p-4">
+      {Object.entries(appliedFilters).map(([key, value]) => {
+        const filterKey = key as keyof IIssueFilterOptions;
+
+        return (
+          <div
+            key={filterKey}
+            className="capitalize py-1 px-2 border border-custom-border-200 rounded-md flex items-center gap-2 flex-wrap"
+          >
+            <span className="text-xs text-custom-text-300">{replaceUnderscoreIfSnakeCase(filterKey)}</span>
+            {(filterKey === "assignees" || filterKey === "created_by" || filterKey === "subscriber") && (
+              <AppliedMembersFilters
+                handleRemove={(val) => handleRemoveFilter(filterKey, val)}
+                members={projectStore.members?.[projectId?.toString() ?? ""]?.map((m) => m.member)}
+                values={value}
+              />
+            )}
+            {(filterKey === "start_date" || filterKey === "target_date") && (
+              <AppliedDateFilters handleRemove={(val) => handleRemoveFilter(filterKey, val)} values={value} />
+            )}
+            {filterKey === "labels" && (
+              <AppliedLabelsFilters
+                handleRemove={(val) => handleRemoveFilter("labels", val)}
+                labels={projectStore.labels?.[projectId?.toString() ?? ""] ?? []}
+                values={value}
+              />
+            )}
+            {filterKey === "priority" && (
+              <AppliedPriorityFilters handleRemove={(val) => handleRemoveFilter("priority", val)} values={value} />
+            )}
+            {filterKey === "state" && (
+              <AppliedStateFilters
+                handleRemove={(val) => handleRemoveFilter("state", val)}
+                states={projectStore.states?.[projectId?.toString() ?? ""]}
+                values={value}
+              />
+            )}
+            {filterKey === "state_group" && (
+              <AppliedStateGroupFilters handleRemove={(val) => handleRemoveFilter("state_group", val)} values={value} />
+            )}
+            <button
+              type="button"
+              className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+              onClick={() => handleRemoveFilter(filterKey, null)}
+            >
+              <X size={12} strokeWidth={2} />
+            </button>
+          </div>
+        );
+      })}
+      <button
+        type="button"
+        onClick={handleClearAllFilters}
+        className="flex items-center gap-2 text-xs border border-custom-border-200 py-1 px-2 rounded-md text-custom-text-300 hover:text-custom-text-200"
+      >
+        Clear all
+        <X size={12} strokeWidth={2} />
+      </button>
+    </div>
+  );
+});
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/index.ts b/web/components/issues/issue-layouts/filters/applied-filters/index.ts
new file mode 100644
index 000000000..4f9bff886
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/index.ts
@@ -0,0 +1,7 @@
+export * from "./date";
+export * from "./filters-list";
+export * from "./label";
+export * from "./members";
+export * from "./priority";
+export * from "./state";
+export * from "./state-group";
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/label.tsx b/web/components/issues/issue-layouts/filters/applied-filters/label.tsx
new file mode 100644
index 000000000..abc5a8b2c
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/label.tsx
@@ -0,0 +1,45 @@
+import { observer } from "mobx-react-lite";
+
+// icons
+import { X } from "lucide-react";
+// types
+import { IIssueLabels } from "types";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  labels: IIssueLabels[] | undefined;
+  values: string[];
+};
+
+export const AppliedLabelsFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, labels, values } = props;
+
+  return (
+    <div className="flex items-center gap-1 flex-wrap">
+      {values.map((labelId) => {
+        const labelDetails = labels?.find((l) => l.id === labelId);
+
+        if (!labelDetails) return null;
+
+        return (
+          <div key={labelId} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
+            <span
+              className="h-1.5 w-1.5 rounded-full"
+              style={{
+                backgroundColor: labelDetails.color,
+              }}
+            />
+            <span className="normal-case">{labelDetails.name}</span>
+            <button
+              type="button"
+              className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+              onClick={() => handleRemove(labelId)}
+            >
+              <X size={10} strokeWidth={2} />
+            </button>
+          </div>
+        );
+      })}
+    </div>
+  );
+});
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/members.tsx b/web/components/issues/issue-layouts/filters/applied-filters/members.tsx
new file mode 100644
index 000000000..0c6d0a6b8
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/members.tsx
@@ -0,0 +1,42 @@
+import { observer } from "mobx-react-lite";
+
+// ui
+import { Avatar } from "components/ui";
+// icons
+import { X } from "lucide-react";
+// types
+import { IUserLite } from "types";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  members: IUserLite[] | undefined;
+  values: string[];
+};
+
+export const AppliedMembersFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, members, values } = props;
+
+  return (
+    <div className="flex items-center gap-1 flex-wrap">
+      {values.map((memberId) => {
+        const memberDetails = members?.find((m) => m.id === memberId);
+
+        if (!memberDetails) return null;
+
+        return (
+          <div key={memberId} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
+            <Avatar user={memberDetails} height="16px" width="16px" />
+            <span className="normal-case">{memberDetails.display_name}</span>
+            <button
+              type="button"
+              className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+              onClick={() => handleRemove(memberId)}
+            >
+              <X size={10} strokeWidth={2} />
+            </button>
+          </div>
+        );
+      })}
+    </div>
+  );
+});
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/priority.tsx b/web/components/issues/issue-layouts/filters/applied-filters/priority.tsx
new file mode 100644
index 000000000..44328afff
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/priority.tsx
@@ -0,0 +1,47 @@
+import { observer } from "mobx-react-lite";
+
+// icons
+import { PriorityIcon } from "components/icons";
+import { X } from "lucide-react";
+// types
+import { TIssuePriorities } from "types";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  values: string[];
+};
+
+export const AppliedPriorityFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, values } = props;
+
+  return (
+    <div className="flex items-center gap-1 flex-wrap">
+      {values.map((priority) => (
+        <div key={priority} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
+          <PriorityIcon
+            priority={priority as TIssuePriorities}
+            className={`!text-xs ${
+              priority === "urgent"
+                ? "text-red-500"
+                : priority === "high"
+                ? "text-orange-500"
+                : priority === "medium"
+                ? "text-yellow-500"
+                : priority === "low"
+                ? "text-green-500"
+                : ""
+            }`}
+          />
+          {priority}
+          <button
+            type="button"
+            className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+            onClick={() => handleRemove(priority)}
+          >
+            <X size={10} strokeWidth={2} />
+          </button>
+        </div>
+      ))}
+    </div>
+  );
+});
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx b/web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx
new file mode 100644
index 000000000..bfeab73ab
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx
@@ -0,0 +1,33 @@
+import { observer } from "mobx-react-lite";
+
+// icons
+import { StateGroupIcon } from "components/icons";
+import { X } from "lucide-react";
+import { TStateGroups } from "types";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  values: string[];
+};
+
+export const AppliedStateGroupFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, values } = props;
+
+  return (
+    <div className="flex items-center gap-1 flex-wrap">
+      {values.map((stateGroup) => (
+        <div key={stateGroup} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
+          <StateGroupIcon stateGroup={stateGroup as TStateGroups} height="12px" width="12px" />
+          {stateGroup}
+          <button
+            type="button"
+            className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+            onClick={() => handleRemove(stateGroup)}
+          >
+            <X size={10} strokeWidth={2} />
+          </button>
+        </div>
+      ))}
+    </div>
+  );
+});
diff --git a/web/components/issues/issue-layouts/filters/applied-filters/state.tsx b/web/components/issues/issue-layouts/filters/applied-filters/state.tsx
new file mode 100644
index 000000000..830c92088
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/applied-filters/state.tsx
@@ -0,0 +1,45 @@
+import { observer } from "mobx-react-lite";
+
+// icons
+import { StateGroupIcon } from "components/icons";
+import { X } from "lucide-react";
+// helpers
+import { getStatesList } from "helpers/state.helper";
+// types
+import { IStateResponse } from "types";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  states: IStateResponse | undefined;
+  values: string[];
+};
+
+export const AppliedStateFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, states, values } = props;
+
+  const statesList = getStatesList(states);
+
+  return (
+    <div className="flex items-center gap-1 flex-wrap">
+      {values.map((stateId) => {
+        const stateDetails = statesList?.find((s) => s.id === stateId);
+
+        if (!stateDetails) return null;
+
+        return (
+          <div key={stateId} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
+            <StateGroupIcon color={stateDetails.color} stateGroup={stateDetails.group} height="12px" width="12px" />
+            {stateDetails.name}
+            <button
+              type="button"
+              className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+              onClick={() => handleRemove(stateId)}
+            >
+              <X size={10} strokeWidth={2} />
+            </button>
+          </div>
+        );
+      })}
+    </div>
+  );
+});
diff --git a/web/components/issues/issue-layouts/header/display-filters/display-filters-selection.tsx b/web/components/issues/issue-layouts/filters/header/display-filters/display-filters-selection.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/display-filters-selection.tsx
rename to web/components/issues/issue-layouts/filters/header/display-filters/display-filters-selection.tsx
diff --git a/web/components/issues/issue-layouts/header/display-filters/display-properties.tsx b/web/components/issues/issue-layouts/filters/header/display-filters/display-properties.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/display-properties.tsx
rename to web/components/issues/issue-layouts/filters/header/display-filters/display-properties.tsx
diff --git a/web/components/issues/issue-layouts/header/display-filters/extra-options.tsx b/web/components/issues/issue-layouts/filters/header/display-filters/extra-options.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/extra-options.tsx
rename to web/components/issues/issue-layouts/filters/header/display-filters/extra-options.tsx
diff --git a/web/components/issues/issue-layouts/header/display-filters/group-by.tsx b/web/components/issues/issue-layouts/filters/header/display-filters/group-by.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/group-by.tsx
rename to web/components/issues/issue-layouts/filters/header/display-filters/group-by.tsx
diff --git a/web/components/issues/issue-layouts/header/display-filters/index.ts b/web/components/issues/issue-layouts/filters/header/display-filters/index.ts
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/index.ts
rename to web/components/issues/issue-layouts/filters/header/display-filters/index.ts
diff --git a/web/components/issues/issue-layouts/header/display-filters/issue-type.tsx b/web/components/issues/issue-layouts/filters/header/display-filters/issue-type.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/issue-type.tsx
rename to web/components/issues/issue-layouts/filters/header/display-filters/issue-type.tsx
diff --git a/web/components/issues/issue-layouts/header/display-filters/order-by.tsx b/web/components/issues/issue-layouts/filters/header/display-filters/order-by.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/order-by.tsx
rename to web/components/issues/issue-layouts/filters/header/display-filters/order-by.tsx
diff --git a/web/components/issues/issue-layouts/header/display-filters/sub-group-by.tsx b/web/components/issues/issue-layouts/filters/header/display-filters/sub-group-by.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/display-filters/sub-group-by.tsx
rename to web/components/issues/issue-layouts/filters/header/display-filters/sub-group-by.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/assignees.tsx b/web/components/issues/issue-layouts/filters/header/filters/assignee.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/assignees.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/assignee.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/created-by.tsx b/web/components/issues/issue-layouts/filters/header/filters/created-by.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/created-by.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/created-by.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/filters-selection.tsx b/web/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
similarity index 99%
rename from web/components/issues/issue-layouts/header/filters/filters-selection.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
index f651f8a05..2e31a16a2 100644
--- a/web/components/issues/issue-layouts/header/filters/filters-selection.tsx
+++ b/web/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
@@ -147,7 +147,7 @@ export const FilterSelection: React.FC<Props> = observer((props) => {
           )}
         </div>
       </div>
-      <div className="w-full h-full divide-y divide-custom-border-20 px-2.5 overflow-y-auto">
+      <div className="w-full h-full divide-y divide-custom-border-200 px-2.5 overflow-y-auto">
         {/* priority */}
         {isFilterEnabled("priority") && (
           <div className="py-2">
diff --git a/web/components/issues/issue-layouts/header/filters/index.ts b/web/components/issues/issue-layouts/filters/header/filters/index.ts
similarity index 89%
rename from web/components/issues/issue-layouts/header/filters/index.ts
rename to web/components/issues/issue-layouts/filters/header/filters/index.ts
index 40190a10e..847b30874 100644
--- a/web/components/issues/issue-layouts/header/filters/index.ts
+++ b/web/components/issues/issue-layouts/filters/header/filters/index.ts
@@ -1,4 +1,4 @@
-export * from "./assignees";
+export * from "./assignee";
 export * from "./created-by";
 export * from "./filters-selection";
 export * from "./labels";
diff --git a/web/components/issues/issue-layouts/header/filters/labels.tsx b/web/components/issues/issue-layouts/filters/header/filters/labels.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/labels.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/labels.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/priority.tsx b/web/components/issues/issue-layouts/filters/header/filters/priority.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/priority.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/priority.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/start-date.tsx b/web/components/issues/issue-layouts/filters/header/filters/start-date.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/start-date.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/start-date.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/state-group.tsx b/web/components/issues/issue-layouts/filters/header/filters/state-group.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/state-group.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/state-group.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/state.tsx b/web/components/issues/issue-layouts/filters/header/filters/state.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/state.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/state.tsx
diff --git a/web/components/issues/issue-layouts/header/filters/target-date.tsx b/web/components/issues/issue-layouts/filters/header/filters/target-date.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/filters/target-date.tsx
rename to web/components/issues/issue-layouts/filters/header/filters/target-date.tsx
diff --git a/web/components/issues/issue-layouts/header/helpers/dropdown.tsx b/web/components/issues/issue-layouts/filters/header/helpers/dropdown.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/helpers/dropdown.tsx
rename to web/components/issues/issue-layouts/filters/header/helpers/dropdown.tsx
diff --git a/web/components/issues/issue-layouts/header/helpers/filter-header.tsx b/web/components/issues/issue-layouts/filters/header/helpers/filter-header.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/helpers/filter-header.tsx
rename to web/components/issues/issue-layouts/filters/header/helpers/filter-header.tsx
diff --git a/web/components/issues/issue-layouts/header/helpers/filter-option.tsx b/web/components/issues/issue-layouts/filters/header/helpers/filter-option.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/helpers/filter-option.tsx
rename to web/components/issues/issue-layouts/filters/header/helpers/filter-option.tsx
diff --git a/web/components/issues/issue-layouts/header/helpers/index.ts b/web/components/issues/issue-layouts/filters/header/helpers/index.ts
similarity index 100%
rename from web/components/issues/issue-layouts/header/helpers/index.ts
rename to web/components/issues/issue-layouts/filters/header/helpers/index.ts
diff --git a/web/components/issues/issue-layouts/header/index.ts b/web/components/issues/issue-layouts/filters/header/index.ts
similarity index 100%
rename from web/components/issues/issue-layouts/header/index.ts
rename to web/components/issues/issue-layouts/filters/header/index.ts
diff --git a/web/components/issues/issue-layouts/header/layout-selection.tsx b/web/components/issues/issue-layouts/filters/header/layout-selection.tsx
similarity index 100%
rename from web/components/issues/issue-layouts/header/layout-selection.tsx
rename to web/components/issues/issue-layouts/filters/header/layout-selection.tsx
diff --git a/web/components/issues/issue-layouts/filters/index.ts b/web/components/issues/issue-layouts/filters/index.ts
new file mode 100644
index 000000000..427d96943
--- /dev/null
+++ b/web/components/issues/issue-layouts/filters/index.ts
@@ -0,0 +1,2 @@
+export * from "./header";
+export * from "./applied-filters";
diff --git a/web/components/issues/issue-layouts/index.ts b/web/components/issues/issue-layouts/index.ts
index f000ec7bf..8840e08df 100644
--- a/web/components/issues/issue-layouts/index.ts
+++ b/web/components/issues/issue-layouts/index.ts
@@ -1,5 +1,5 @@
 export * from "./calendar";
+export * from "./filters";
 export * from "./gantt";
-export * from "./header";
 export * from "./kanban";
 export * from "./spreadsheet";
diff --git a/web/store/issue_filters.ts b/web/store/issue_filters.ts
index ab2d6e0dd..c8af5a51f 100644
--- a/web/store/issue_filters.ts
+++ b/web/store/issue_filters.ts
@@ -112,22 +112,6 @@ class IssueFilterStore implements IIssueFilterStore {
     return computedFilters;
   };
 
-  calendarLayoutDateRange = () => {
-    const { activeMonthDate, activeWeekDate } = this.rootStore.calendar.calendarFilters;
-
-    const calendarLayout = this.userDisplayFilters.calendar?.layout ?? "month";
-
-    let filterDate = new Date();
-
-    if (calendarLayout === "month") filterDate = activeMonthDate;
-    else filterDate = activeWeekDate;
-
-    const startOfMonth = renderDateFormat(new Date(filterDate.getFullYear(), filterDate.getMonth(), 1));
-    const endOfMonth = renderDateFormat(new Date(filterDate.getFullYear(), filterDate.getMonth() + 1, 0));
-
-    return [`${startOfMonth};after`, `${endOfMonth};before`];
-  };
-
   get appliedFilters(): TIssueParams[] | null {
     if (
       !this.userFilters ||
@@ -155,12 +139,12 @@ class IssueFilterStore implements IIssueFilterStore {
       start_target_date: this.userDisplayFilters?.start_target_date || true,
     };
 
-    if (this.userDisplayFilters.layout === "calendar") filteredRouteParams.target_date = this.calendarLayoutDateRange();
-    if (this.userDisplayFilters.layout === "gantt_chart") filteredRouteParams.start_target_date = true;
-
     const filteredParams = handleIssueQueryParamsByLayout(this.userDisplayFilters.layout, "issues");
     if (filteredParams) filteredRouteParams = this.computedFilter(filteredRouteParams, filteredParams);
 
+    if (this.userDisplayFilters.layout === "calendar") filteredRouteParams.group_by = "target_date";
+    if (this.userDisplayFilters.layout === "gantt_chart") filteredRouteParams.start_target_date = true;
+
     return filteredRouteParams;
   }