diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index 3585ac871..520b5be17 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -388,35 +388,43 @@ export const IssuesView: React.FC<Props> = ({
         handleClose={() => setTransferIssuesModal(false)}
         isOpen={transferIssuesModal}
       />
-      <div className="flex items-center justify-between gap-2 -mt-2">
-        <FilterList filters={filters} setFilters={setFilters} />
-        {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
-          <PrimaryButton
-            onClick={() => {
-              if (viewId) {
-                setFilters({}, true);
-                setToastAlert({
-                  title: "View updated",
-                  message: "Your view has been updated",
-                  type: "success",
-                });
-              } else
-                setCreateViewModal({
-                  query: filters,
-                });
-            }}
-            className="flex items-center gap-2 text-sm"
+      {issueView !== "calendar" && (
+        <div>
+          <div
+            className={`flex items-center justify-between gap-2 ${
+              issueView === "list" ? "px-8 mt-6" : "-mt-2"
+            }`}
           >
-            {!viewId && <PlusIcon className="h-4 w-4" />}
-            {viewId ? "Update" : "Save"} view
-          </PrimaryButton>
-        )}
-      </div>
-
-      {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
-        <div className="my-4 border-t" />
+            <FilterList filters={filters} setFilters={setFilters} />
+            {Object.keys(filters).length > 0 &&
+              nullFilters.length !== Object.keys(filters).length && (
+                <PrimaryButton
+                  onClick={() => {
+                    if (viewId) {
+                      setFilters({}, true);
+                      setToastAlert({
+                        title: "View updated",
+                        message: "Your view has been updated",
+                        type: "success",
+                      });
+                    } else
+                      setCreateViewModal({
+                        query: filters,
+                      });
+                  }}
+                  className="flex items-center gap-2 text-sm"
+                >
+                  {!viewId && <PlusIcon className="h-4 w-4" />}
+                  {viewId ? "Update" : "Save"} view
+                </PrimaryButton>
+              )}
+          </div>
+          {Object.keys(filters).length > 0 &&
+            nullFilters.length !== Object.keys(filters).length && (
+              <div className={` ${issueView === "list" ? "mt-4" : "my-4"} border-t`} />
+            )}
+        </div>
       )}
-
       <DragDropContext onDragEnd={handleOnDragEnd}>
         <StrictModeDroppable droppableId="trashBox">
           {(provided, snapshot) => (
diff --git a/apps/app/components/core/list-view/all-lists.tsx b/apps/app/components/core/list-view/all-lists.tsx
index bdd0c4f2c..27cd92fa5 100644
--- a/apps/app/components/core/list-view/all-lists.tsx
+++ b/apps/app/components/core/list-view/all-lists.tsx
@@ -36,7 +36,7 @@ export const AllLists: React.FC<Props> = ({
   return (
     <>
       {groupedByIssues && (
-        <div className="flex flex-col space-y-5 gap-4 bg-white">
+        <div className="flex flex-col space-y-5 bg-white">
           {Object.keys(groupedByIssues).map((singleGroup) => {
             const currentState =
               selectedGroup === "state" ? states?.find((s) => s.id === singleGroup) : null;
diff --git a/apps/app/components/core/list-view/single-issue.tsx b/apps/app/components/core/list-view/single-issue.tsx
index 0ed235028..df2d1cb3a 100644
--- a/apps/app/components/core/list-view/single-issue.tsx
+++ b/apps/app/components/core/list-view/single-issue.tsx
@@ -216,9 +216,9 @@ export const SingleListIssue: React.FC<Props> = ({
           </ContextMenu.Item>
         </a>
       </ContextMenu>
-      <div className="border-b mx-4 border-gray-300 last:border-b-0">
+      <div className="border-b mx-6 border-gray-300 last:border-b-0">
         <div
-          className="flex items-center justify-between gap-2 px-4 py-3"
+          className="flex items-center justify-between gap-2  py-3"
           onContextMenu={(e) => {
             e.preventDefault();
             setContextMenu(true);