diff --git a/src/components/Resource/ResourceBoard.tsx b/src/components/Resource/ResourceBoard.tsx
index f76604ff9f6..1f8ccafcb5d 100644
--- a/src/components/Resource/ResourceBoard.tsx
+++ b/src/components/Resource/ResourceBoard.tsx
@@ -5,7 +5,8 @@ import { useTranslation } from "react-i18next";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";
 
-import ButtonV2 from "@/components/Common/ButtonV2";
+import { Button } from "@/components/ui/button";
+
 import { ExportButton } from "@/components/Common/Export";
 import Loading from "@/components/Common/Loading";
 import PageTitle from "@/components/Common/PageTitle";
@@ -92,10 +93,10 @@ export default function BoardView() {
             currentTab={boardFilter !== ACTIVE ? 1 : 0}
           />
           <div className="flex w-full flex-col gap-2 lg:mr-4 lg:w-fit lg:flex-row lg:gap-4">
-            <ButtonV2 className="py-[11px]" onClick={onListViewBtnClick}>
-              <CareIcon icon="l-list-ul" />
+            <Button variant={"primary"} onClick={onListViewBtnClick}>
+              <CareIcon icon="l-list-ul" className="mr-2" />
               {t("list_view")}
-            </ButtonV2>
+            </Button>
             <AdvancedFilterButton
               onClick={() => advancedFilter.setShow(true)}
             />
diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx
index 891c2f3378b..3bca8377a6b 100644
--- a/src/components/Resource/ResourceList.tsx
+++ b/src/components/Resource/ResourceList.tsx
@@ -5,7 +5,8 @@ import Chip from "@/CAREUI/display/Chip";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";
 
-import ButtonV2 from "@/components/Common/ButtonV2";
+import { Button } from "@/components/ui/button";
+
 import { ExportButton } from "@/components/Common/Export";
 import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
@@ -34,8 +35,10 @@ export default function ListView() {
 
   const { t } = useTranslation();
 
-  const onBoardViewBtnClick = () =>
+  const onBoardViewBtnClick = () => {
     navigate("/resource/board", { query: qParams });
+    localStorage.setItem("defaultResourceView", "board");
+  };
   const appliedFilters = formatFilter(qParams);
 
   const { loading, data, refetch } = useQuery(routes.listResourceRequests, {
@@ -216,10 +219,10 @@ export default function ListView() {
           </div>
 
           <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
-            <ButtonV2 className="py-[11px]" onClick={onBoardViewBtnClick}>
-              <CareIcon icon="l-list-ul" className="rotate-90" />
+            <Button variant={"primary"} onClick={onBoardViewBtnClick}>
+              <CareIcon icon="l-list-ul" className="rotate-90 mr-2" />
               {t("board_view")}
-            </ButtonV2>
+            </Button>
             <AdvancedFilterButton
               onClick={() => advancedFilter.setShow(true)}
             />
diff --git a/src/components/Shifting/ShiftingBoard.tsx b/src/components/Shifting/ShiftingBoard.tsx
index 8486c8dd4d0..cd9f4300fd4 100644
--- a/src/components/Shifting/ShiftingBoard.tsx
+++ b/src/components/Shifting/ShiftingBoard.tsx
@@ -6,7 +6,8 @@ import { useTranslation } from "react-i18next";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";
 
-import ButtonV2 from "@/components/Common/ButtonV2";
+import { Button } from "@/components/ui/button";
+
 import ConfirmDialog from "@/components/Common/ConfirmDialog";
 import { ExportButton } from "@/components/Common/Export";
 import Loading from "@/components/Common/Loading";
@@ -75,6 +76,10 @@ export default function BoardView() {
 
   const [boardFilter, setBoardFilter] = useState(activeBoards);
   const { t } = useTranslation();
+  const onListViewBtnClick = () => {
+    navigate("/shifting/list", { query: qParams });
+    localStorage.setItem("defaultShiftView", "list");
+  };
 
   return (
     <div className="flex-col px-2 pb-2">
@@ -119,13 +124,10 @@ export default function BoardView() {
           />
 
           <div className="flex w-full flex-col gap-2 lg:mr-4 lg:w-fit lg:flex-row lg:gap-4">
-            <ButtonV2
-              className="py-[11px]"
-              onClick={() => navigate("/shifting/list", { query: qParams })}
-            >
-              <CareIcon icon="l-list-ul" />
+            <Button variant={"primary"} onClick={onListViewBtnClick}>
+              <CareIcon icon="l-list-ul" className="mr-2" />
               {t("list_view")}
-            </ButtonV2>
+            </Button>
             <AdvancedFilterButton
               onClick={() => advancedFilter.setShow(true)}
             />
diff --git a/src/components/Shifting/ShiftingList.tsx b/src/components/Shifting/ShiftingList.tsx
index 7161ea29441..f9727bdd819 100644
--- a/src/components/Shifting/ShiftingList.tsx
+++ b/src/components/Shifting/ShiftingList.tsx
@@ -4,7 +4,8 @@ import { useTranslation } from "react-i18next";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";
 
-import ButtonV2 from "@/components/Common/ButtonV2";
+import { Button } from "@/components/ui/button";
+
 import { ExportButton } from "@/components/Common/Export";
 import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
@@ -32,6 +33,10 @@ export default function ListView() {
   } = useFilters({ cacheBlacklist: ["patient_name"] });
 
   const { t } = useTranslation();
+  const onBoardViewBtnClick = () => {
+    navigate("/shifting/board", { query: qParams });
+    localStorage.setItem("defaultShiftView", "board");
+  };
   const {
     data: shiftData,
     loading,
@@ -73,13 +78,10 @@ export default function ListView() {
           </div>
 
           <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
-            <ButtonV2
-              className="py-[11px]"
-              onClick={() => navigate("/shifting/board", { query: qParams })}
-            >
-              <CareIcon icon="l-list-ul" className="rotate-90" />
+            <Button variant={"primary"} onClick={onBoardViewBtnClick}>
+              <CareIcon icon="l-list-ul" className="rotate-90 mr-2" />
               {t("board_view")}
-            </ButtonV2>
+            </Button>
             <AdvancedFilterButton
               onClick={() => advancedFilter.setShow(true)}
             />