diff --git a/src/components/Dashboards/AccountDashboard.jsx b/src/components/Dashboards/AccountDashboard.jsx
index 4a3d7fd..254097b 100644
--- a/src/components/Dashboards/AccountDashboard.jsx
+++ b/src/components/Dashboards/AccountDashboard.jsx
@@ -40,7 +40,7 @@ const AccountDashboard = ({ className, bannerList }) => {
           );
         })}
       </div>
-      <div className="w-full grid-cols-1 md:grid-cols-2 xxl:grid-cols-3 grid items-center justify-center gap-2 md:gap-4">
+      <div className="w-full grid-cols-1 md:grid-cols-2 2xl::grid-cols-3 grid items-center justify-center gap-2 md:gap-4">
         {getLowerBanner?.map((props, idx) => {
           let image = getImage(props);
 
@@ -67,7 +67,7 @@ export default AccountDashboard;
 
 const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
   return (
-    <div className="flex flex-col shadow-md rounded-xl">
+    <div className="flex flex-col shadow-md rounded-xl dark:border-[#5356fb29]">
       <Link to={link_path} key={key} className="h-[12rem] rounded-t-xl">
         <img
           src={image}
@@ -75,8 +75,8 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
           className="w-full h-full rounded-t-xl object-cover"
         />
       </Link>
-      <div className="h-[7rem] rounded-b-xl bg-white">
-        <div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2">
+      <div className="h-[7rem] rounded-b-xl bg-white dark:bg-dark-white">
+        <div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2 dark:text-white">
           <Link to={link_path} className="font-bold text-lg">
             {title}
           </Link>
@@ -84,7 +84,7 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
             {desc}
           </Link>
         </div>
-        <div className="flex justify-between w-full px-2 items-center">
+        <div className="flex justify-between w-full px-2 items-center pt-[0.2rem]">
           <Link to={link_path} className="text-slate-300 font-semibold text-sm">
             {btn}
           </Link>
@@ -103,11 +103,11 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
   return (
     <div
       key={key}
-      className="flex flex-col bg-white shadow-md h-full rounded-xl"
+      className="flex flex-col bg-white shadow-md h-full rounded-xl dark:border-[#5356fb29] dark:bg-dark-white"
     >
       <div className="w-full flex justify-between border-b border-slate-300 p-2">
         <div className="h-[130px] flex justify-between items-center">
-          <div className="px-2 flex flex-col gap-2">
+          <div className="px-2 flex flex-col gap-2 dark:text-white">
             <Link to={link_path} className="text-lg font-bold">
               {title}
             </Link>
diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx
index 624e119..5793095 100644
--- a/src/components/Partials/Header.jsx
+++ b/src/components/Partials/Header.jsx
@@ -166,7 +166,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
           {/* user info */}
           <div className="user-info flex items-center justify-end w-full xl:space-x-7 space-x-2 z-10 ">
             {/* dark mode */}
-            <button
+            {/* <button
               onClick={darkMode.handleThemeSwitch}
               type="button"
               className="xl:w-[176px] w-[52px] h-[52px] dark:bg-white bg-dark-gray border border-pink rounded-full flex justify-center items-center"
@@ -237,7 +237,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                   {darkMode.theme === "light" ? "Dark" : "Light"} Mode
                 </span>
               </div>
-            </button>
+            </button> */}
             {/* balance */}
 
             {/* My Page Button */}
diff --git a/src/components/Partials/RightSideBar.jsx b/src/components/Partials/RightSideBar.jsx
index db8b73d..9974a09 100644
--- a/src/components/Partials/RightSideBar.jsx
+++ b/src/components/Partials/RightSideBar.jsx
@@ -1,10 +1,11 @@
-import React, { useState } from "react";
+import React, { useContext, useState } from "react";
 import { useSelector } from "react-redux";
 import { NavLink } from "react-router-dom";
 //import SideStatistics from "./SideStatistics";
 import { localImgLoad } from "../../lib";
+import DarkModeContext from "../Contexts/DarkModeContext";
 
-export default function RightSideBar({myJobList}) {
+export default function RightSideBar({ myJobList }) {
   const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"];
   const [filterDataSet, setFilterDataSet] = useState([10, 30, 20, 40]);
   const dataSetHandler = (value) => {
@@ -16,6 +17,7 @@ export default function RightSideBar({myJobList}) {
       setFilterDataSet([8, 15, 40, 30]);
     }
   };
+  const darkMode = useContext(DarkModeContext);
 
   const [selectedRate, setSelectedRate] = useState("ETH");
   const [rateStaticsDropdown, setRateStaticsDropdown] = useState(false);
@@ -153,79 +155,168 @@ export default function RightSideBar({myJobList}) {
                 </p>
               </div>
             </div>
+            {/* dark mode */}
+            <div
+              onClick={darkMode.handleThemeSwitch}
+              className="item flex space-x-3 items-center mb-4"
+            >
+              <div className="flex space-x-2.5 items-center">
+                <span className="dark:text-dark-gray text-white">
+                  <svg
+                    width="27"
+                    height="27"
+                    viewBox="0 0 27 27"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                    className="fill-current"
+                  >
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M18.3065 16.3771C18.1572 16.6304 17.986 16.8743 17.7937 17.1062C17.7118 17.2044 17.7247 17.3515 17.8228 17.4339C17.9208 17.5163 18.0665 17.5028 18.1484 17.4046C18.3569 17.1532 18.5419 16.8897 18.7043 16.6155C18.7695 16.5051 18.7334 16.3622 18.6238 16.2966C18.5142 16.2304 18.3722 16.2668 18.3065 16.3771ZM18.9591 14.722C18.8948 15.0116 18.8078 15.2975 18.6982 15.5759C18.6511 15.6955 18.7093 15.831 18.8282 15.878C18.9466 15.9255 19.0812 15.8668 19.1283 15.7477C19.2472 15.446 19.3411 15.1368 19.4104 14.8231C19.4382 14.6978 19.3596 14.5735 19.2347 14.5456C19.1103 14.5176 18.9864 14.5968 18.9591 14.722ZM19.0673 12.944C19.0955 13.2411 19.1006 13.5395 19.0825 13.8375C19.0747 13.9655 19.1718 14.0763 19.2994 14.0837C19.4266 14.0917 19.5362 13.9939 19.5441 13.8659C19.564 13.5437 19.5584 13.2206 19.5274 12.8994C19.5154 12.7713 19.4021 12.6777 19.2754 12.6899C19.1482 12.702 19.0548 12.816 19.0673 12.944ZM18.6229 11.2201C18.7422 11.4948 18.8388 11.7769 18.9128 12.0641C18.9447 12.1884 19.071 12.2629 19.1949 12.2308C19.3184 12.1987 19.3924 12.0716 19.3605 11.9473C19.2805 11.6363 19.1755 11.3304 19.0465 11.0334C18.9951 10.9156 18.8587 10.8616 18.7417 10.9133C18.6247 10.9649 18.5715 11.1023 18.6229 11.2201ZM17.6651 9.72283C17.8653 9.94816 18.0448 10.1856 18.2034 10.4333C18.2723 10.5413 18.4157 10.5725 18.523 10.5026C18.6303 10.4333 18.6612 10.2889 18.5919 10.1809C18.4208 9.91324 18.2265 9.65578 18.0092 9.4123C17.9241 9.31639 17.7779 9.30848 17.6827 9.39414C17.5879 9.4798 17.58 9.62738 17.6651 9.72283Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M13.4409 5.61267C9.08757 5.61267 5.55359 9.14665 5.55359 13.5C5.55359 17.8533 9.08757 21.3873 13.4409 21.3873C17.7942 21.3873 21.3282 17.8533 21.3282 13.5C21.3282 9.14665 17.7942 5.61267 13.4409 5.61267ZM13.9049 6.5559C17.5298 6.79484 20.4003 9.81475 20.4003 13.5C20.4003 17.1852 17.5298 20.2051 13.9049 20.4441V6.5559Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M12.1116 1.32213V3.46343C12.1116 4.19318 12.7072 4.78556 13.4409 4.78556C14.1746 4.78556 14.7702 4.19318 14.7702 3.46343V1.32213C14.7702 0.592374 14.1746 0 13.4409 0C12.7072 0 12.1116 0.592374 12.1116 1.32213Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M21.0877 4.01472L19.5511 5.5513C19.0274 6.07499 19.0274 6.92528 19.5511 7.44898C20.0748 7.97267 20.9251 7.97267 21.4488 7.44898L22.9854 5.9124C23.509 5.38871 23.509 4.53841 22.9854 4.01472C22.4617 3.49102 21.6114 3.49102 21.0877 4.01472Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M25.6581 12.3649H23.4849C22.7443 12.3649 22.1431 12.9661 22.1431 13.7068C22.1431 14.4474 22.7443 15.0486 23.4849 15.0486H25.6581C26.3988 15.0486 27 14.4474 27 13.7068C27 12.9661 26.3988 12.3649 25.6581 12.3649Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M22.9854 21.5012L21.4488 19.9646C20.9251 19.4409 20.0748 19.4409 19.5511 19.9646C19.0274 20.4883 19.0274 21.3386 19.5511 21.8623L21.0877 23.3989C21.6114 23.9226 22.4617 23.9226 22.9854 23.3989C23.509 22.8752 23.509 22.0249 22.9854 21.5012Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M14.7702 25.6778V23.5365C14.7702 22.8068 14.1746 22.2144 13.4409 22.2144C12.7072 22.2144 12.1116 22.8068 12.1116 23.5365V25.6778C12.1116 26.4076 12.7072 27 13.4409 27C14.1746 27 14.7702 26.4076 14.7702 25.6778Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M5.78958 23.0647L7.29553 21.5372C7.80878 21.0166 7.80878 20.1714 7.29553 19.6508C6.78228 19.1302 5.94893 19.1302 5.43568 19.6508L3.92974 21.1783C3.41649 21.6989 3.41649 22.5441 3.92974 23.0647C4.44299 23.5853 5.27633 23.5853 5.78958 23.0647Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M1.32213 14.8293H3.46343C4.19318 14.8293 4.78556 14.2337 4.78556 13.5C4.78556 12.7663 4.19318 12.1707 3.46343 12.1707H1.32213C0.592374 12.1707 0 12.7663 0 13.5C0 14.2337 0.592374 14.8293 1.32213 14.8293Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M3.92974 5.82165L5.43568 7.34911C5.94893 7.86969 6.78228 7.86969 7.29553 7.34911C7.80878 6.82853 7.80878 5.98328 7.29553 5.46269L5.78958 3.93524C5.27633 3.41465 4.44299 3.41465 3.92974 3.93524C3.41649 4.45582 3.41649 5.30107 3.92974 5.82165Z"
+                    />
+                  </svg>
+                </span>
+                <p className="text-thin-light-gray text-base font-medium">
+                  {darkMode.theme === "light" ? "Dark" : "Light"} Mode
+                </p>
+              </div>
+            </div>
           </div>
         </div>
 
         {/*JOB LINKS*/}
-        {(userDetails?.account_type !== "FAMILY" && myJobList?.data?.result_list?.length > 0) &&
-        <div className="top-platform mt-6 bg-white dark:bg-dark-white rounded-2xl py-8 2xl:w-[268px] w-full 2xl:mb-10 2xl:border-none border ">
-          {/* heading */}
-          <div className="px-8 heading flex justify-between items-center mb-3.5">
-            <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
-              Job Links
-            </h3>
-            <div></div>
-          </div>
-
-          <div className="platform-list">
-              <div className="px-8 item flex space-x-3 items-center mb-4">
-                {/* image */}
-                <div className="w-8 h-8 p-[4px] rounded-full">
-                  <img src={localImgLoad('images/icons/job_active.svg')} className="w-full h-full" alt='Active Task' />
-                </div>
-                {/* name */}
-                <div>
-                  <p className="text-thin-light-gray text-base font-medium">
-                    <NavLink to="/my-active-jobs">Active Task</NavLink>
-                  </p>
-                </div>
-                {/* action */}
+        {userDetails?.account_type !== "FAMILY" &&
+          myJobList?.data?.result_list?.length > 0 && (
+            <div className="top-platform mt-6 bg-white dark:bg-dark-white rounded-2xl py-8 2xl:w-[268px] w-full 2xl:mb-10 2xl:border-none border ">
+              {/* heading */}
+              <div className="px-8 heading flex justify-between items-center mb-3.5">
+                <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
+                  Job Links
+                </h3>
+                <div></div>
               </div>
 
-              <div className="px-8 item flex space-x-3 items-center mb-4">
-                {/* image */}
-                <div className="w-8 h-8 p-[4px] rounded-full">
-                  <img src={localImgLoad('images/icons/job_pending.svg')} className="w-full h-full" alt='Review Task' />
+              <div className="platform-list">
+                <div className="px-8 item flex space-x-3 items-center mb-4">
+                  {/* image */}
+                  <div className="w-8 h-8 p-[4px] rounded-full">
+                    <img
+                      src={localImgLoad("images/icons/job_active.svg")}
+                      className="w-full h-full"
+                      alt="Active Task"
+                    />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/my-active-jobs">Active Task</NavLink>
+                    </p>
+                  </div>
+                  {/* action */}
                 </div>
-                {/* name */}
-                <div>
-                  <p className="text-thin-light-gray text-base font-medium">
-                    <NavLink to="/my-review-jobs">Review</NavLink>
-                  </p>
+
+                <div className="px-8 item flex space-x-3 items-center mb-4">
+                  {/* image */}
+                  <div className="w-8 h-8 p-[4px] rounded-full">
+                    <img
+                      src={localImgLoad("images/icons/job_pending.svg")}
+                      className="w-full h-full"
+                      alt="Review Task"
+                    />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/my-review-jobs">Review</NavLink>
+                    </p>
+                  </div>
+                </div>
+
+                <div className="px-8 item flex space-x-3 items-center mb-4">
+                  {/* image */}
+                  <div className="w-8 h-8 p-[4px] rounded-full">
+                    <img
+                      src={localImgLoad("images/icons/job_past_due.svg")}
+                      className="w-full h-full"
+                      alt="Past Due Task"
+                    />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/my-pastdue-jobs">Past Due</NavLink>
+                    </p>
+                  </div>
+                </div>
+
+                {/* Line */}
+                <div className="my-4 mx-auto w-10/12 h-[2px] bg-slate-500 dark:bg-white rounded-full"></div>
+
+                <div className="px-8 item flex space-x-3 items-center mb-4">
+                  {/* image */}
+                  <div className="w-8 h-8 p-[4px] rounded-full">
+                    <img
+                      src={localImgLoad("images/icons/job_group.svg")}
+                      className="w-full h-full"
+                      alt="Job Groups"
+                    />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/job-groups">Job Groups</NavLink>
+                    </p>
+                  </div>
                 </div>
               </div>
-
-              <div className="px-8 item flex space-x-3 items-center mb-4">
-                {/* image */}
-                <div className="w-8 h-8 p-[4px] rounded-full">
-                  <img src={localImgLoad('images/icons/job_past_due.svg')} className="w-full h-full" alt='Past Due Task' />
-                </div>
-                {/* name */}
-                <div>
-                  <p className="text-thin-light-gray text-base font-medium">
-                    <NavLink to="/my-pastdue-jobs">Past Due</NavLink>
-                  </p>
-                </div>
-              </div>
-
-              {/* Line */}
-              <div className="my-4 mx-auto w-10/12 h-[2px] bg-slate-500 dark:bg-white rounded-full"></div>
-
-              <div className="px-8 item flex space-x-3 items-center mb-4">
-                {/* image */}
-                <div className="w-8 h-8 p-[4px] rounded-full">
-                  <img src={localImgLoad('images/icons/job_group.svg')} className="w-full h-full" alt='Job Groups' />
-                </div>
-                {/* name */}
-                <div>
-                  <p className="text-thin-light-gray text-base font-medium">
-                    <NavLink to="/job-groups">Job Groups</NavLink>
-                  </p>
-                </div>
-              </div>
-          </div>
-        </div>
-        }
+            </div>
+          )}
       </div>
     </>
   );