diff --git a/src/components/master/CreateActivity.jsx b/src/components/master/CreateActivity.jsx
index b7d2c862..2970d0c1 100644
--- a/src/components/master/CreateActivity.jsx
+++ b/src/components/master/CreateActivity.jsx
@@ -111,6 +111,14 @@ const CreateActivity = ({ onClose }) => {
     reset();
     onClose();
   };
+
+
+
+  // for tooltip
+  useEffect(() => {
+    const tooltipTriggerList = Array.from(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+    tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el));
+  }, []);
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <h6>Create Activity</h6>
@@ -197,7 +205,9 @@ const CreateActivity = ({ onClose }) => {
                       onClick={() => removeChecklistItem(index)}
                       className="btn btn-xs btn-icon btn-text-secondary"
                     >
-                      <i class="bx bxs-minus-circle text-danger"></i>
+                      <i class="bx bxs-minus-circle text-danger"  data-bs-toggle="tooltip"
+                title="Remove Check"
+                data-bs-original-title="Remove check"></i>
                     </button>
                   </td>
                 </tr>
@@ -210,7 +220,9 @@ const CreateActivity = ({ onClose }) => {
             className="btn btn-xs btn-primary mt-2"
             onClick={addChecklistItem}
           >
-            <i class="bx bx-plus-circle"></i>
+            <i class="bx bx-plus-circle" data-bs-toggle="tooltip"
+                title="Add Check"
+                data-bs-original-title="Add check" ></i>
           </button>
         </div>
 
diff --git a/src/components/master/EditActivity.jsx b/src/components/master/EditActivity.jsx
index ea1cd364..bccdbd2f 100644
--- a/src/components/master/EditActivity.jsx
+++ b/src/components/master/EditActivity.jsx
@@ -123,6 +123,13 @@ const UpdateActivity = ({ activityData, onClose }) => {
     remove(index);
   };
 
+
+    // for tooltip
+      useEffect(() => {
+        const tooltipTriggerList = Array.from(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+        tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el));
+      }, []);
+
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <h6>Update Activity</h6>
@@ -206,9 +213,12 @@ const UpdateActivity = ({ activityData, onClose }) => {
                        <button
                          type="button"
                          onClick={() => removeChecklistItem(index)}
-                         className="btn btn-xs btn-icon btn-text-secondary"
+                       className="btn btn-xs btn-icon btn-text-secondary"
+                       
                        >
-                         <i className="bx bxs-minus-circle text-danger"></i>
+                         <i className="bx bxs-minus-circle text-danger"data-bs-toggle="tooltip"
+                title="Add Check"
+                data-bs-original-title="Add check"  ></i>
                        </button>
                      </td>
                    </tr>
@@ -223,7 +233,9 @@ const UpdateActivity = ({ activityData, onClose }) => {
             className="btn btn-xs btn-primary mt-2"
             onClick={addChecklistItem}
           >
-        <i className="bx bx-plus-circle"></i>
+         <i class="bx bx-plus-circle" data-bs-toggle="tooltip"
+                title="Add Check"
+                data-bs-original-title="Add check" ></i>
           </button>
         </div>
 
diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx
index 3a2dd4ae..dbc8bbee 100644
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@@ -19,9 +19,13 @@ const MasterModal = ({ modaldata, closeModal }) => {
       aria-labelledby="modalToggleLabel"
     >
       <div
-        className={`modal-dialog  mx-sm-auto mx-1 ${
-          modaldata?.modalType === "delete" || `Ativity` ? "modal-md" : "modal-lg"
-        } modal-simple `}
+        className={`modal-dialog mx-sm-auto mx-1 ${
+          ["Application Role", "Edit-Application Role"].includes(
+            modaldata?.modalType
+          )
+            ? "modal-lg"
+            : "modal-md"
+        } modal-simple`}
       >
         <div className="modal-content">
           <div className="modal-body p-sm-4 p-0">
@@ -52,10 +56,13 @@ const MasterModal = ({ modaldata, closeModal }) => {
               <EditJobRole data={modaldata.item} onClose={closeModal} />
             )}
             {modaldata?.modalType === "Activity" && (
-              <CreateActivity onClose={closeModal} /> )
-            }
-            {modaldata?.modalType === 'Edit-Activity' && (
-              <EditActivity activityData={modaldata.item} onClose={closeModal} />
+              <CreateActivity onClose={closeModal} />
+            )}
+            {modaldata?.modalType === "Edit-Activity" && (
+              <EditActivity
+                activityData={modaldata.item}
+                onClose={closeModal}
+              />
             )}
           </div>
         </div>
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx
index 0952f022..84b46aeb 100644
--- a/src/pages/authentication/LoginPage.jsx
+++ b/src/pages/authentication/LoginPage.jsx
@@ -88,7 +88,6 @@ const LoginPage = () => {
             <label className="form-label" htmlFor="password">
               Password
             </label>
-      
           </div>
           <div className="input-group input-group-merge">
             <input
@@ -101,16 +100,22 @@ const LoginPage = () => {
               placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
               aria-describedby="password"
             />
-            <span
-              className="input-group-text cursor-pointer"
+            <button
+              type="button"
+              className="btn border-top border-end border-bottom"
               onClick={() => setHidepass(!hidepass)}
+              style={{
+                borderTopLeftRadius: 0,
+                borderBottomLeftRadius: 0,
+                borderLeft: 0,
+              }}
             >
               {hidepass ? (
-                <i className="bx bx-hide"></i>
+                <i className="bx bx-hide" />
               ) : (
-                <i className="bx bx-show"></i>
+                <i className="bx bx-show" />
               )}
-            </span>
+            </button>
           </div>
           {errors.password && (
             <div
@@ -130,16 +135,14 @@ const LoginPage = () => {
               name="rememberMe"
               {...register("rememberMe")}
             />
-            <label className="form-check-label ms-2" >
-              Remember Me
-            </label>
+            <label className="form-check-label ms-2">Remember Me</label>
           </div>
           <Link
-              aria-label="Go to Forgot Password Page"
-              to="/auth/forgot-password"
-            >
-              <span>Forgot Password?</span>
-            </Link>
+            aria-label="Go to Forgot Password Page"
+            to="/auth/forgot-password"
+          >
+            <span>Forgot Password?</span>
+          </Link>
         </div>
         <div className="mb-3">
           <button
diff --git a/src/pages/authentication/ResetPasswordPage.jsx b/src/pages/authentication/ResetPasswordPage.jsx
index de1984b9..1f4afd80 100644
--- a/src/pages/authentication/ResetPasswordPage.jsx
+++ b/src/pages/authentication/ResetPasswordPage.jsx
@@ -118,16 +118,23 @@ const ResetPasswordPage = () => {
               placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
               aria-describedby="password"
             />
-            <span
-              className="input-group-text lcursor-pointer"
+            <button
+              type="button"
+              className="btn btn-outline-secondy border-top border-end border-bottom "
               onClick={() => setHidepass(!hidepass)}
+              style={{
+                borderTopLeftRadius: 0,
+                borderBottomLeftRadius: 0,
+                borderLeft: 0,
+                
+              }}
             >
               {hidepass ? (
-                <i className="bx bx-hide"></i>
+                <i className="bx bx-hide" />
               ) : (
-                <i className="bx bx-show"></i>
+                <i className="bx bx-show" />
               )}
-            </span>
+            </button>
           </div>
           {errors.password && (
             <div
@@ -154,16 +161,23 @@ const ResetPasswordPage = () => {
               placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
               aria-describedby="password"
             />
-            <span
-              className="input-group-text cursor-pointer"
+             <button
+              type="button"
+              className="btn border-top border-end border-bottom "
               onClick={() => setHidepass1(!hidepass1)}
+              style={{
+                borderTopLeftRadius: 0,
+                borderBottomLeftRadius: 0,
+                borderLeft: 0,
+                
+              }}
             >
               {hidepass1 ? (
-                <i className="bx bx-hide"></i>
+                <i className="bx bx-hide" />
               ) : (
-                <i className="bx bx-show"></i>
+                <i className="bx bx-show" />
               )}
-            </span>
+            </button>
           </div>
           {errors.confirmPassword && (
             <div