diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 3aaaaabd..ea9c7fc0 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -551,6 +551,13 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
     $routes->get("claimView", "EmployeeRestController::claimView");
     $routes->get("exportCashDepositData", "EmployeeRestController::exportCashDepositData");
 
+
+    //thz_master's
+    $routes->post("ticketSave", "ThzController::ticketSave");
+    $routes->get("ticketList", "ThzController::ticketList");
+    $routes->post("ticketConversationSave", "ThzController::ticketConversationSave");
+    $routes->get("ticketConversationList", "ThzController::ticketConversationList");
+
 });
 $routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");
 $routes->get("sendPushNotification", "EmployeeRestController::sendPushNotification");
@@ -636,6 +643,7 @@ $routes->post('enrollment','VidalApiController::enrollment');
 
 
 $routes->post("ticketSave", "ThzController::ticketSave");
-$routes->post("ticketList", "ThzController::ticketList");
+$routes->get("ticketList", "ThzController::ticketList");
 $routes->post("ticketConversationSave", "ThzController::ticketConversationSave");
-$routes->post("ticketConversationList", "ThzController::ticketConversationList");
\ No newline at end of file
+$routes->get("ticketConversationList", "ThzController::ticketConversationList");
+$routes->get('ticketAssigning',"ThzController::ticketAssigning");
\ No newline at end of file
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index be2d0f5f..fd2f424f 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -8,6 +8,7 @@ use CodeIgniter\HTTP\ResponseInterface;
 use App\Models\ThzMasterModel;
 use App\Models\ThzMasterNotesModel;
 use App\ControllerCleaners\ThzControllerCleaner;
+use App\Models\UserModel;
 
 class ThzController extends BaseController
 {
@@ -17,11 +18,14 @@ class ThzController extends BaseController
 
     protected $thzControllerCleaner;
 
+    protected $userModel;
+
     public function __construct()
     {
         $this->thzMasterModel       = new ThzMasterModel();
         $this->thzMasterNotesModel  = new ThzMasterNotesModel();
         $this->thzControllerCleaner = new ThzControllerCleaner();
+        $this->userModel            = new UserModel();
     }
 
     public function index()
@@ -31,136 +35,203 @@ class ThzController extends BaseController
 
     public function ticketSave(){
 
-        $data = $this->request->getJSON(true);
-
-            if (!empty($data['thz_id'])) {           
-                $data['updated_by'] = get_session_userid();
-                $ticket_id = $data['thz_id'];
-                $text = "update"; 
-
-                $result = $this->thzMasterModel->where('thz_id', $ticket_id)->set($data)->update();
-            } else {
-                $data['created_by'] = get_session_userid();
-                $text = "create"; 
-
-                $result = $this->thzMasterModel->insert($data);
-            }
-
-            return $this->response->setJSON(([ 'status' => $result ? 'success' : 'error' , 
-                                           'message' => $result ? "Ticket {$text}d successfully" : "Unable to {$text} ticket. Please try again." ]));
-
-
-
+        $data = $this->request->getPost();
+        // $data = $this->request->getJSON(true);
+        // $return_type = isset($data['return_type']) ? $data['return_type'] : 'api';
+        if (!empty($data['thz_id'])) {
+            $text = "update";            
+            $result = $this->updateTicket($data);
+        } else {
+            $text = "create";
+            $result = $this->insertTicket($data);
+        }
 
+        return $this->response->setJSON([ 
+                'status' => $result ? 'success' : 'error',
+                'message' => $result ? "Ticket {$text}d successfully" : "Unable to {$text} ticket. Please try again." 
+                ])->setStatusCode($result ? 200 : 400);
     }
     
-
     public function ticketList()
     {
 
         $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
         
-        $data = $this->request->getJSON(true);
+        $data = $this->request->getGet();
 
         $tickets = $this->fetchTicketsBasedOnrole($data);
 
-
-
         if ($returnType === 'api') {
             if (empty($tickets)) {
-            return $this->response->setJSON([ 'status'  => 'error','message' => 'No tickets found',])->setStatusCode(404);
+            return $this->response->setJSON([ 'status'  => 'error','message' => 'No tickets found'])->setStatusCode(404);
             }
         }else{
           
             $data['page_name'] = "Ticket List";
             $data['ticket_data'] = $tickets;
-            $data['assigner'] = $this->userModel->where('is_active', 1)->findAll();
-            return $this->loadLayout('ticket_list_web', $data);
-        }
-
-       
+            $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['1', '5'])->findAll(); // enga 5-"head" and 1-"admin" role person thaan assignee..
+            return $this->loadLayout('thz_list', $data);
+        }       
 
         return $this->response->setJSON([
             'status' => 'success',
             'data'   => $tickets,
-        ]);
+        ])->setStatusCode(200);
     }
 
-
     public function ticketConversationSave(){
 
             $data = $this->request->getJSON(true);
 
             $result = $this->thzMasterNotesModel->insert($data);
 
-        if(empty($result)){
-            return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']));
-        }
-
-            return $this->response->setJSON((['status' => 'success', 'data' => $result]));
+            if(empty($result)){
+                return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
+            }
 
+            
+            return $this->response->setJSON([ 
+                'status' => $result ? 'success' : 'error',
+                'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again." 
+                ])->setStatusCode($result ? 200 : 400);
     
     }
 
     public function ticketConversationList(){
 
-            $data = $this->request->getJSON(true);
+            $data = $this->request->getGet();
 
             $thz_id = $data['thz_id'] ?? null;
 
-            $result = $this->thzMasterNotesModel->ticketConversationList($thz_id);  
+            if($thz_id){
+                $result['master'] = $this->thzMasterModel
+                        ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
+                        ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                        ->where('thz_master.thz_id', $thz_id)
+                        ->findAll();
 
-        if(empty($result)){
-            return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']));
-        }
-
-            return $this->response->setJSON((['status' => 'success', 'data' => $result]));
+                $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id);
+                $result['notes'] = !empty($notes) ? $notes : [];
+                
+            }else{
+                return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
+            }
+            
+            return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(400);
 
     }
 
+    public function ticketSaveNotification($data){
+       
+    }
 
+    public function ticketConversationSaveNotification($data){
+
+    }
+
+    public function ticketAssigning(){
+
+        $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
+
+        $data = $this->request->getVar();
+
+        $assignee_id    = $data['assignee_id']; 
+
+        $thz_id         = $data['thz_id'];
+
+        $result         = $this->thzMasterModel->set('assign_to',$assignee_id)->where('thz_id',$thz_id)->update();
+
+        if($returnType === 'api'){
+
+            if(empty($result)){
+                return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']));
+            }
+
+                return $this->response->setJSON((['status' => 'success', 'data' => $result]));
+
+        }else{
+
+            
+
+        }
+
+
+
+
+
+    }
 
 
     /**************************************************   PRIVATE FUNCTIONS  ********************************************************/
 
 
-    private function checkGeneralUserOrEmployee($data){
-
-        if($data['empcode']){
-            return $data['empcode'];
-        } elseif ($data['mobile']) {
-            return $data['mobile'];
-        } elseif ($data['email']) {
-            return $data['email'];
-        } else {
-            return null;
-        }
-
-    }
-
     private function fetchTicketsBasedOnrole(array $data): array
     {
-        $id        = $data['thz_id']    ?? null;
+        // $id        = $data['thz_id']    ?? null;
         $assign_to = $data['assign_to'] ?? null;
         $mobile    = $data['mobile']    ?? null;
 
         if (!empty($assign_to)) {
             // Tickets assigned to a staff
             return $this->thzMasterModel
-                        ->where('assign_to', $assign_to)
+                        ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
+                        ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                        ->where('thz_master.assign_to', $assign_to)
                         ->findAll();
         }
 
-        if (!empty($id) && !empty($mobile)) {
+        // if (!empty($id) && !empty($mobile)) {
+        if (!empty($mobile)) {
             // Specific ticket by ID and mobile
             return $this->thzMasterModel
-                        ->where('thz_id', $id)
-                        ->where('mobile', $mobile)
+                        ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
+                        ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                        // ->where('thz_id', $id)
+                        ->where('thz_master.mobile', $mobile)
                         ->findAll();
         }
 
         // All tickets (e.g., for managers)
-        return $this->thzMasterModel->findAll();
+        return $this->thzMasterModel
+                    ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
+                    ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                    ->findAll();
+    }
+
+    private function notificationBasedOnRole($data){
+
+        $id        = $data['thz_id']    ?? null;
+        $assign_to = $data['assign_to'] ?? null;
+        $mobile    = $data['mobile']    ?? null;
+
+        if (!empty($assign_to)) {
+            
+        }
+
+        if (!empty($id) && !empty($mobile)) {
+
+        }
+
+
+    }
+
+    private function updateTicket($data){
+
+        $data['updated_by'] = get_session_userid();
+        $ticket_id = $data['thz_id'];
+        $result = $this->thzMasterModel->where('thz_id', $ticket_id)->set($data)->update();
+
+        return $result;
+
+    }
+
+    private function insertTicket($data){
+
+        $data['created_by'] = get_session_userid();
+        $result = $this->thzMasterModel->insert($data);
+
+        return $result;
+
     }
 
 
diff --git a/app/Models/ThzMasterModel.php b/app/Models/ThzMasterModel.php
index 410a84ba..580c6181 100644
--- a/app/Models/ThzMasterModel.php
+++ b/app/Models/ThzMasterModel.php
@@ -12,7 +12,7 @@ class ThzMasterModel extends Model
     protected $returnType       = 'array';
     protected $useSoftDeletes   = false;
     protected $protectFields    = true;
-    protected $allowedFields    = ['name','mobile','email','empcode','policy_no','ticket_type','subject','message','status','assign_to','created_at','updated_at'];
+    protected $allowedFields    = ['name','mobile','email','empcode','policy_no','ticket_type','subject','message','status','assign_to','created_at','updated_at','created_by','updated_by' ,'client_id' ,'policy_id' ,'branch_id'];
 
     protected bool $allowEmptyInserts = false;
 
diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index 769b505d..6b738219 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -40,7 +40,7 @@ class ThzMasterNotesModel extends Model
     protected $beforeDelete   = [];
     protected $afterDelete    = [];
 
-    public function ticketConversationList($thz_id){
+    public function ticketConversationLists($thz_id){
 
 
         if(empty($thz_id)){
@@ -76,5 +76,33 @@ class ThzMasterNotesModel extends Model
 
     }
 
+    public function ticketConversationList($thz_id)
+    {
+        
+        $notes_sql = "SELECT 
+                            thz_master_notes.*,
+                            CASE 
+                                WHEN LOWER(thz_master_notes.notes_by) = 'staff' 
+                                    THEN CONCAT(user_profiles.first_name, ' ', user_profiles.last_name)
+                                WHEN LOWER(thz_master_notes.notes_by) = 'user' 
+                                    THEN thz_master.name
+                                ELSE thz_master_notes.notes_by
+                            END AS name
+                    FROM thz_master_notes
+                    LEFT JOIN user_profiles 
+                            ON user_profiles.id = thz_master_notes.created_by 
+                        AND LOWER(thz_master_notes.notes_by) = 'staff'
+                    LEFT JOIN thz_master 
+                            ON thz_master.thz_id = thz_master_notes.thz_id 
+                        AND LOWER(thz_master_notes.notes_by) = 'user'
+                    WHERE thz_master_notes.thz_id = " . (int)$thz_id . "
+                    ORDER BY thz_master_notes.created_at ASC";
+
+        $result = $this->db->query($notes_sql)->getResultArray();
+
+        return $result;
+    }
+
+
 
 }
diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index b0cefc4e..b9e1294c 100755
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -193,6 +193,10 @@
         min-height: 70vh !important;
     }
 
+    .active{
+        color : white !important ;
+    }
+
 
 </style>
 
@@ -212,12 +216,12 @@
 
                          <li class="nav-item d-flex justify-content-center align-items-center"> 
                             <a  href="#pending-actions-dash-tab" data-toggle="tab" aria-expanded="false"
-                                class="nav-link px-3 py-1 " id="pending_actions_tab">
+                                class="nav-link px-3 py-1 dash-anchor" id="pending_actions_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_pending_actions.png" alt="Logo" height="14" class="inactive_pending" >
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_pending_actions.png" alt="Logo" height="14" 
                                 class="active_pending" style="display:none;">
                                 &nbsp;&nbsp;
-                                <span class="d-none d-sm-inline-block">Pending Actions</span>
+                                <span class="d-none d-sm-inline-block dash-tab">Pending Actions</span>
                             </a>
                         </li>
                         &nbsp;&nbsp;&nbsp;&nbsp;
@@ -226,12 +230,12 @@
                     <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
                          <li class="nav-item d-flex justify-content-center align-items-center">
-                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1" id="bds_tab">
+                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor" id="bds_tab">
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_bds.png" alt="Logo" height="14" class="inactive_bds">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_bds.png" alt="Logo" height="14" 
-                                class="active_bds" style="display:none;">
+                                class="active_bds " style="display:none;">
                                     &nbsp;&nbsp;
-                                <span class="d-none d-sm-inline-block">BDS</span>
+                                <span class="d-none d-sm-inline-block dash-tab">BDS</span>
                             </a>
                         </li>
                          &nbsp;&nbsp;&nbsp;&nbsp;
@@ -242,12 +246,12 @@
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
                     <li class="nav-item d-flex justify-content-center align-items-center">
-                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1"  id="claims_tab">
+                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="claims_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_claims.png" alt="Logo" height="14" class="inactive_claims">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_claims.png" alt="Logo" height="14" 
-                                 class="active_claims" style="display:none;">
+                                 class="active_claims " style="display:none;">
                                     &nbsp;&nbsp;
-                            <span class="d-none d-sm-inline-block">Claims</span>
+                            <span class="d-none d-sm-inline-block dash-tab">Claims</span>
                         </a>
                     </li>
                      &nbsp;&nbsp;&nbsp;&nbsp;
@@ -256,13 +260,13 @@
                         <?php
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
-                    <li class="nav-item d-flex justify-content-center align-items-center">
-                        <a  href="#leads-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1"  id="leads_tab" >
+                    <li class="nav-item d-flex justify-content-center align-items-center ">
+                        <a  href="#leads-dash-tab " data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="leads_tab" >
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_leads_and_bds_renewal.png" alt="Logo" height="14" class="inactive_leads">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_leads_and_bds_renewal.png" alt="Logo" height="14" 
-                                class="active_leads" style="display:none;">
+                                class="active_leads " style="display:none;">
                                     &nbsp;&nbsp;
-                            <span class="d-none d-sm-inline-block">Leads and BDS Renewals</span>
+                            <span class="d-none d-sm-inline-block dash-tab">Leads and BDS Renewals</span>
                         </a>
                     </li>
              &nbsp;&nbsp;&nbsp;&nbsp;
@@ -375,3 +379,20 @@ $(document).ready(function(){
 });
 </script>
 
+<script>
+
+// $(document).on('click', '.dash-anchor', function () {
+//     console.log("clicked dynamic", this);
+
+//     // remove active class from all tabs
+//     $('.dash-tab').removeClass('active');
+
+//     // add active only to the clicked one's child span
+//     $(this).find('.dash-tab').addClass('active');
+// });
+
+
+
+
+</script>
+
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index b7de1d73..5f8d59f2 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -223,6 +223,20 @@ table.dataTable tbody td {
     .text-danger {
         color: #dc3545;
     }
+
+    .btn-color{
+        background-color: rgba(52, 174, 178, 1);
+        color: white;
+        border:1px solid rgba(52, 174, 178, 1);
+    }
+
+    .btn-color:hover{
+        background-color: rgba(41, 139, 142, 1);
+        color: white;
+        border:1px solid  rgba(41, 139, 142, 1);
+    }
+
+
 </style>
 
 <!-- End ADD and EDIT Page HTML -->
@@ -234,9 +248,6 @@ table.dataTable tbody td {
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">User List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <button type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="modal" data-target="#con-close-modal" data-placement="top" title="Add" data-trigger="hover">ADD</button>                
-                        </div>
                     </div>
                     <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0" id="tickets-table">
                         <thead class="bg-light">
@@ -372,7 +383,7 @@ table.dataTable tbody td {
 <!-- Tooltip container separate from trigger -->
 <div class="tooltip-container" id="tooltipContainer">
     <div class="tooltip" id="accessMatrixTooltip">
-        <table class="tooltip-table">
+        <table class="tooltip-table" style="color: black;">
             <thead>
                 <tr>
                     <th>Team</th>
@@ -464,7 +475,7 @@ table.dataTable tbody td {
 
 <div class="tooltip-container" id="roleTooltipContainer">
     <div class="tooltip" id="roleAccessMatrixTooltip">
-        <table class="tooltip-table">
+        <table class="tooltip-table" style="color: black;">
             <thead>
                 <tr>
                     <th>Team</th>
@@ -520,7 +531,17 @@ table.dataTable tbody td {
                     exportOptions: {
                         columns: ':not(:last-child)'
                     }
+                },
+                {
+                    text: 'ADD',
+                    className: 'btn-color',
+                    attr: {
+                        id: 'btnAdd',
+                        title: 'Add'
+                    }
                 }
+
+
             ],
 
 
@@ -541,14 +562,6 @@ table.dataTable tbody td {
         });
         
 
-        $('#btnAdd').click(function(){
-            $('#first_name').val('');
-            $('#last_name').val('');
-            $('#email').val('');
-            $('#mobile').val('');
-            $('#emp_code').val('');        
-            $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');     
-        })    
 
 
         $('.close').click(function(){
@@ -815,3 +828,17 @@ table.dataTable tbody td {
     }
 </script>
 
+<script>
+    $(document).on('click', '#btnAdd', function(){
+        $('#first_name').val('');
+        $('#last_name').val('');
+        $('#email').val('');
+        $('#mobile').val('');
+        $('#emp_code').val('');        
+        $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');    
+        let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
+        myModal.show();  // open modal
+
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/Views/bds_dash.php b/app/Views/bds_dash.php
index 24a5effa..52996c3f 100644
--- a/app/Views/bds_dash.php
+++ b/app/Views/bds_dash.php
@@ -158,14 +158,19 @@
 
 
 <div class="tab-pane <?= isset($add_active_calss) ? $add_active_calss : 'fade' ?>" id="bds-dash-tab" >
-    <div class="row">
-        <div class="StatusTileHide" style="display: none; padding-bottom: 10px;padding-left: 17px">
-            <a href="#" onclick="hide_status_show_pending_tile()" ><i class="fas fa-arrow-left"></i> Back to Overview</a>
+
+
+    <div class="row d-flex  align-items-center">
+        <div class="StatusTileHide" style="padding-left: 25px;">
+            <a href="#" onclick="hide_status_show_pending_tile()" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
         </div>
-        <div class="StatusTileHide" style="display: none;padding-left: 30px;">
-                <a href="#" id="mainMenuTiles">Current Tile : </a>
+        <div class="StatusTileHide" style="display: none;padding-left: 15px;">
+            <a href="#" id="mainMenuTiles">Current Tile : </a>
         </div>
     </div>
+    <br>
+
+
     <div class="row">
         <div class="col inside-tab-content-div">
                     <?php if (in_array(BUSINESS_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
@@ -310,7 +315,7 @@ function show_business_status_tile(){
 
     $('.businessStatusTile').show()
     $('.StatusTileHide').show()
-    $("#mainMenuTiles").text("Viewing Details of Business Team Pending");
+    $("#mainMenuTiles").text(" Business Team Pending");
 
     $('.businessPendingTile').hide()
     $('.financePendingTile').hide()
@@ -338,7 +343,7 @@ function show_finance_status_tile(){
 
     $('.financePendingTile').hide()
     $('.businessPendingTile').hide()
-    $("#mainMenuTiles").text("Viewing Details of Finance Team Pending");
+    $("#mainMenuTiles").text("Finance Team Pending");
 
 
 }
diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php
index 81977a54..7c6e0a97 100644
--- a/app/Views/business_team_list.php
+++ b/app/Views/business_team_list.php
@@ -137,8 +137,8 @@ table.dataTable tbody td {
                                     <label>Date<span class="text-danger"></span></label>
                                     <div id="reportrange" class="form-control"
                                         style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="fa fa-calendar"></i>&nbsp;
-                                        <span></span> <i class="fa fa-caret-down"></i>
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index 8e7bb060..1df5c220 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -44,9 +44,7 @@ table.dataTable thead th {
     cursor: pointer !important;
 }   
 
-.addbtnStyle{
-    margin-left: 20px !important;
-}
+
 
 .dataTables_filter {
     position: absolute;
@@ -231,7 +229,7 @@ table.dataTable thead th {
                 }, 
                 {
                     text: 'Add',
-                    className: 'buttons-html5 addbtnStyle',
+                    className: 'buttons-html5 ',
                     action: function (e, dt, node, config) {
                         showCdMasterAddModal();
                     }
diff --git a/app/Views/claims_dash.php b/app/Views/claims_dash.php
index 430bbfbb..e5a104a6 100644
--- a/app/Views/claims_dash.php
+++ b/app/Views/claims_dash.php
@@ -139,6 +139,7 @@
         border:2px solid #09B9BF;
         box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);
         min-width: 250px;
+        max-width: 250px;
     }
 
     #claims-dash-tab{
@@ -199,20 +200,22 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
     </div>
 
 
-    <div class="row">
-        <div class="goBack" style="padding-bottom: 10px;padding-left: 17px;">
-            <a href="#" onclick="hideAndShowTile('2')" ><i class="fas fa-arrow-left"></i> Back to Overview<br></a>
+    <div class="row d-flex  align-items-center">
+        <div class="goBack" style="padding-left: 25px;">
+            <a href="#" onclick="hideAndShowTile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
         </div>
-        <div class="goBack" style="display: none;padding-left: 30px;">
+        <div class="goBack" style="display: none;padding-left: 15px;">
             <a href="#" id="current_tile">Current Tile : </a>
         </div>
     </div>
+    <br>
+    
     <div class="row">
         <div class="col inside-tab-content-div">
-                    <?php
-        $colorSetCount = count($colorShades); // Number of color sets
-        $shadeCount = count($colorShades[0]); // Number of shades per set
-        $index = 0;
+        <?php
+            $colorSetCount  = count($colorShades); // Number of color sets
+            $shadeCount     = count($colorShades[0]); // Number of shades per set
+            $index = 0;
         ?>
 
         <?php foreach ($claim_data as $ticketTypeId => $statuses) : ?>
@@ -239,16 +242,23 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
                 $truncatedStatus = strlen($formattedStatus) > 20 ? substr($formattedStatus, 0, 15) . '...' : $formattedStatus;
                 $showTooltip = strlen($formattedStatus) > 20;
                 ?>
+
+                <?php 
+                     $formattedStatus = explode('-',$formattedStatus);
+                ?>
                 
                 <div class="claimStatusTitle claimStatusTitle_<?=$ticketTypeId?>" style="display: none;">
                     <div class="card dash-card"  onclick="linkRedirectForClaims(<?= $ticketTypeId ?>, '<?= $status ?>','<?= $statuses[$status . '_ids'] ?? '' ?>')">
                         <div class="card-block">
-                            <h5 class="text-right"
-                                <?= $showTooltip ? 'data-toggle="tooltip" title="' . htmlspecialchars($formattedStatus, ENT_QUOTES, 'UTF-8') . '"' : '' ?>>
-                                <span class="f-left"> <?= $truncatedStatus ?> </span>
+                            <h5 class="text-right <?= isset($formattedStatus[1]) ? 'mt-1 mb-0':''?>">
+                                <span class="f-left" style="word-break: break-word; white-space: normal;">
+                                    <?= htmlspecialchars($formattedStatus[0], ENT_QUOTES, 'UTF-8') ?>
+                                </span>
                                 <span class="span-color"><?= $count ?></span>
+                                <p class="text-left mt-1 mb-0" style="font-size: x-small !important;"><?= htmlspecialchars($formattedStatus[1]??'', ENT_QUOTES, 'UTF-8') ?></p>
                             </h5>
                         </div>
+
                         
 
                     </div>
@@ -312,13 +322,13 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
             $('.claimStatusTitle_'+claimType).show();
 
             if (claimType == 1) {
-                $('#current_tile').text("Viewing Details For : GMC");
+                $('#current_tile').text(" GMC");
             } else if (claimType == 2) {
-                $('#current_tile').text("Viewing Details For : GPA");
+                $('#current_tile').text(" GPA");
             } else if (claimType == 3) {
-                $('#current_tile').text("Viewing Details For : EDLI");
+                $('#current_tile').text(" EDLI");
             } else if (claimType == 4) {
-                $('#current_tile').text("Viewing Details For : GTLI");
+                $('#current_tile').text(" GTLI");
             }
         }
     }
diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php
index b1818640..79adc7f7 100755
--- a/app/Views/client_deposit_list.php
+++ b/app/Views/client_deposit_list.php
@@ -10,7 +10,7 @@
 
                     </div>
                     <div class="col-6" style="text-align: right;">
-                        <a href="<?= base_url("client/list"); ?>"><i class="fas fa-arrow-left" style="font-size: 17px;"></i></a>
+                        <a href="<?= base_url("client/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i></a>
                     </div>
                     <!-- <div class="col-6" style="text-align: right; position: relative;top: 53px;">
                             <a href="<?= base_url("client/client_deposit"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index ea7bc6c5..346f9f10 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -1,3 +1,4 @@
+
 <style>
 .table th,
 .table td {
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 2e6dddae..d37f28e5 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -271,7 +271,7 @@ body {
                         <h4  style="position: relative;">Client Onboarding  <?php if(isset($client)) {echo ' - ' . $client['client_name']; } ?></h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
-                        <a href="<?= base_url("client/list"); ?>"><i class="fas fa-arrow-left" style="font-size: 17px;"></i></a>
+                        <a href="<?= base_url("client/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i></a>
                     </div>
                 </div>
                 
@@ -287,7 +287,7 @@ body {
                     </li>
                     <li class="nav-item">
                         <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                            <span class="mr-1"><i class="fa fa-file"></i></span>
+                            <span class="mr-1"><i class="mdi mdi-file"></i></span>
                             <span class="d-none d-sm-inline-block">KYC Docs</span>
                         </a>
                     </li>
@@ -318,7 +318,7 @@ body {
                     <li class="nav-item">
                         <a href="#hr-access-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="hr_access_tab" onclick="appendHrAccessControllHtml(this)">
                             <span class="mr-1"><i class="mdi mdi-book-open-page-variant"></i></span>
-                            <span class="d-none d-sm-inline-block">HR Access Controll</span>
+                            <span class="d-none d-sm-inline-block">HR Access Control</span>
                         </a>
                     </li>
                     <li class="nav-item">
@@ -357,7 +357,7 @@ body {
                         <div class="row">
                             <div class="col-12">
                                 <div class="card">
-                                    <div class="card-body" id="hr_activity_history_append_area" style="position: relative;bottom: 50px;">
+                                    <div class="card-body" id="hr_activity_history_append_area" style="padding-top:0; margin-top:0;">
                                     </div>
                                 </div>
                             </div> <!-- end col -->
@@ -571,19 +571,19 @@ body {
                 const otherContent = otherCard.querySelector('.card-content');
                 const otherIcon = otherCard.querySelector('.accordion-icon i');
                 otherContent.classList.remove('active');
-                otherIcon.classList.remove('fa-chevron-up');
-                otherIcon.classList.add('fa-chevron-down');
+                otherIcon.classList.remove('mdi mdi-chevron-up');
+                otherIcon.classList.add('mdi mdi-chevron-down');
             }
         });
 
         // Toggle current accordion
         content.classList.toggle('active');
         if (content.classList.contains('active')) {
-            icon.classList.remove('fa-chevron-down');
-            icon.classList.add('fa-chevron-up');
+            icon.classList.remove('mdi mdi-chevron-down');
+            icon.classList.add('mdi mdi-chevron-up');
         } else {
-            icon.classList.remove('fa-chevron-up');
-            icon.classList.add('fa-chevron-down');
+            icon.classList.remove('mdi mdi-chevron-up');
+            icon.classList.add('mdi mdi-chevron-down');
         }
     }
 
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 8dfdcce8..4d5503ec 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -23,8 +23,8 @@
 <div class="tab-pane fade" id="police-tab">
 
     <div class="row float-right" style="padding-bottom: 10px; position: relative;right: 13px;">
-        <button type="button" id="BtnAdd" class="btn btn-primary waves-effect waves-light btnAdd btn-sm" style="position: relative;right: 10px;"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy</button>
-        <button type="button" id="BtnAddSuccess" class="btn btn-success waves-effect waves-light BtnAddSuccess btn-sm" onclick="showModal()"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy From Lead</button>
+        <button type="button" id="BtnAdd" class="btn btn-primary waves-effect waves-light btnAdd btn-sm" style="position: relative;right: 10px;"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy</button>
+        <button type="button" id="BtnAddSuccess" class="btn btn-success waves-effect waves-light BtnAddSuccess btn-sm" onclick="showModal()"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy From Lead</button>
     </div>
 
     <div class="table-responsive" id="table_list">
@@ -669,7 +669,7 @@
                     // Conditionally render the delete option based on the role
                     if (role !== 3 && role !== 4) {
                         policyTable += `
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="fa fa-trash mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete-outline mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
                     }
 
                     policyTable += `              
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index d88a4619..96da7591 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -73,17 +73,17 @@
                     </div>
                     <div class="col-1">
                         <div id="categoryFilter_11">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="fetchEmpolyeeList(event);" data-toggle="tooltip" data-placement="top" title="Search" id="get-emp-list"><i class="fa fa-search" aria-hidden="true"></i></a>
+                            <a class="btn btn-primary waves-effect waves-light" onclick="fetchEmpolyeeList(event);" data-toggle="tooltip" data-placement="top" title="Search" id="get-emp-list"><i class="mdi mdi-magnify" aria-hidden="true"></i></a>
                         </div>
                     </div>
                     <div class="col-0" style="margin-right: 15px; ">
                         <div id="categoryFilter_12">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><i class="fa fa-bell" aria-hidden="true"></i></a>
+                            <a class="btn btn-primary waves-effect waves-light" onclick="sendManualReminder(this)" data-toggle="tooltip" data-placement="top" title="Send Reminder"><i class="mdi mdi-bell" aria-hidden="true"></i></a>
                         </div>
                     </div>
                     <div class="col-0">
                         <div id="categoryFilter_13">
-                            <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><i class="fas fa-file-upload" ></i></a>
+                            <a class="btn btn-primary waves-effect waves-light" onclick="uploadEnrollmentFile(this)" data-toggle="tooltip" data-placement="top" title="Enrollment File Upload"><i class="mdi mdi-file-export" ></i></a>
                         </div>
                     </div>
                     
@@ -92,7 +92,7 @@
                 <!-- <div class="row" style="margin-bottom: 44px;"> -->
                         <div class="col-1 text-right view-status-btn" style="position: relative;bottom: 7px;">
                         <button type="button" class="btn btn-link visa_status_button" onclick="toggleContent()" style="color: #000;" data-toggle="tooltip" data-placement="top" title="View Status Card">
-                            Status <i id="toggleIcon" class="fas fa-minus"></i>
+                            Status <i id="toggleIcon" class="mdi mdi-minus" style="background-color:white"></i>
                         </button>
                     </div>
                 </div>
@@ -454,25 +454,25 @@
             buttons: [
                 {
                     extend: 'copy',
-                    text: '<i class="fa fa-copy"></i>',
+                    text: '<i class="mdi mdi-content-copy"></i>',
                     titleAttr: 'Copy',
                     filename: 'Enrolment List'
                 },
                 {
                     extend: 'print',
-                    text: '<i class="fa fa-print"></i>',
+                    text: '<i class="mdi mdi-printer"></i>',
                     titleAttr: 'Print',
                     filename: 'Enrolment List'
                 },
                 {
                     extend: 'pdf',
-                    text: '<i class="fa fa-file-pdf"></i>',
+                    text: '<i class="mdi mdi-file-pdf"></i>',
                     titleAttr: 'PDF',
                     filename: 'Enrolment List'
                 },
                 {
                     extend: 'csv',
-                    text: '<i class="fa fa-file-csv"></i>',
+                    text: '<i class="mdi mdi-file-document"></i>',
                     titleAttr: 'CSV',
                     filename: 'Enrolment List'
                 }
diff --git a/app/Views/finance_team_list.php b/app/Views/finance_team_list.php
index b9d3f0b6..9613b9df 100644
--- a/app/Views/finance_team_list.php
+++ b/app/Views/finance_team_list.php
@@ -137,8 +137,8 @@ table.dataTable tbody td {
                                     <label>Date<span class="text-danger"></span></label>
                                     <div id="reportrange" class="form-control"
                                         style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="fa fa-calendar"></i>&nbsp;
-                                        <span></span> <i class="fa fa-caret-down"></i>
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
diff --git a/app/Views/hr_access_controll.php b/app/Views/hr_access_controll.php
index 033b54cb..877bec10 100644
--- a/app/Views/hr_access_controll.php
+++ b/app/Views/hr_access_controll.php
@@ -24,7 +24,7 @@
                                     <p class="user-email"><?= $value['hr_mail'] ?></p>
                                 </div>
                                 <div class="accordion-icon">
-                                    <i class="fas fa-chevron-down"></i>
+                                    <i class="mdi mdi-chevron-down"></i>
                                 </div>
                             </div>
                             <div class="card-content">
diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php
index e9dc0a18..15d53361 100644
--- a/app/Views/hr_activity_history.php
+++ b/app/Views/hr_activity_history.php
@@ -27,8 +27,8 @@ table.dataTable tbody td {
     <div class="form-group col-md-3" id="date_div">
         <!-- <label>ActivityDate<span class="text-danger"></span></label> -->
         <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-            <i class="fa fa-calendar"></i>&nbsp;
-            <span></span> <i class="fa fa-caret-down"></i>
+            <i class="mdi mdi-calendar-blank"></i>&nbsp;
+            <span></span> <i class="mdi mdi-menu-down"></i>
         </div>
         <input type="hidden" id="startDate">
         <input type="hidden" id="endDate">
diff --git a/app/Views/import_export.php b/app/Views/import_export.php
index 7f2bc15d..604e9853 100755
--- a/app/Views/import_export.php
+++ b/app/Views/import_export.php
@@ -21,7 +21,7 @@
                 </li>
                 <li class="nav-item">
                     <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">Insurer or TPA Data</span>
                     </a>
                 </li>
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 5168ba4f..e7ce6e82 100755
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -26,6 +26,19 @@
     color: #16181b !important;
     cursor: pointer !important;
 }   
+
+.btn-color{
+  background-color: rgba(52, 174, 178, 1);
+  color: white;
+  border:1px solid rgba(52, 174, 178, 1);
+}
+
+.btn-color:hover{
+    background-color: rgba(41, 139, 142, 1);
+    color: white;
+    border:1px solid  rgba(41, 139, 142, 1);
+}
+
 </style>
 <div class="row" id="insurer_list">
     <div class="col-12">
@@ -35,9 +48,6 @@
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">Insurer List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <a href="<?= base_url("master/insurer/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
-                        </div>
                     </div>
                 <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
                     id="tickets-table">
@@ -182,6 +192,13 @@ document.addEventListener("DOMContentLoaded", function () {
                 exportOptions: {
                     columns: ':not(:last-child)'
                 }
+            },
+            {
+                text: 'ADD',
+                className: 'btn btn-color',
+                action: function () {
+                    window.location.href = "<?= base_url("master/insurer/create"); ?>";
+                }
             }
         ],
 
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index bdc3fd71..68c10e80 100755
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -8,7 +8,7 @@
                     </div>
                     <div class="col-6" style="text-align: right;">
                         <a href="<?= base_url("master/insurer/list"); ?>" >
-                            <i class="fas fa-arrow-left" style="font-size: 17px;"></i> 
+                            <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> 
                         </a>
                     </div>
 
diff --git a/app/Views/irba_report.php b/app/Views/irba_report.php
index d86d4452..bb4d0427 100644
--- a/app/Views/irba_report.php
+++ b/app/Views/irba_report.php
@@ -15,8 +15,8 @@
                             <div class="form-group col-md-4" id="date_div">
                                 <label>Date<span class="text-danger"></span></label>
                                 <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="fa fa-calendar"></i>&nbsp;
-                                    <span></span> <i class="fa fa-caret-down"></i>
+                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                    <span></span> <i class="mdi mdi-menu-down"></i>
                                 </div>
                                 <input type="hidden" id="startDate" value=<?= $default_start ?>>
                                 <input type="hidden" id="endDate" value=<?= $default_end ?>>
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index c1a72d31..8e8eefd6 100755
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -26,6 +26,19 @@
     color: #16181b !important;
     cursor: pointer !important;
 }   
+
+.btn-color{
+  background-color: rgba(52, 174, 178, 1);
+  color: white;
+  border:1px solid rgba(52, 174, 178, 1);
+}
+
+.btn-color:hover{
+    background-color: rgba(41, 139, 142, 1);
+    color: white;
+    border:1px solid  rgba(41, 139, 142, 1);
+}
+
 </style>
 <div class="row" id="kyc_list">
     <div class="col-12">
@@ -35,9 +48,6 @@
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">KYC List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <a href="<?= base_url("master/kyc/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
-                        </div>
                     </div>
                 <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
                     id="tickets-table">
@@ -176,6 +186,13 @@
                 exportOptions: {
                     columns: ':not(:last-child)'
                 }
+            },
+            {
+                text: 'ADD',
+                className: 'btn btn-color',
+                action: function () {
+                    window.location.href = "<?= base_url("master/kyc/create"); ?>";
+                }
             }
         ],
 
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index 412331ba..7ddeefb4 100755
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -39,7 +39,7 @@ body {
                         <h4 style="position: relative;">KYC Entity Type</h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
-                        <a href="<?= base_url("master/kyc/list"); ?>" ><i class="fas fa-arrow-left" style="font-size: 17px;"></i> </a>
+                        <a href="<?= base_url("master/kyc/list"); ?>" ><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div>
                 </div>
                 <ul class="nav nav-pills navtab-bg">
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 59150e0f..8085112c 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -246,6 +246,13 @@
                 flex: 1 1 auto; */
             padding: 2rem !important;
         }
+
+        /* Force all text across the entire app to black */
+        html, body, * {
+            color: #000 !important;
+        }
+
+
     </style>
 
     <style>
@@ -422,7 +429,6 @@
 
         .search-bar input {
             width: 100%;
-            padding-right: 40px; /* make space for the button */
             border-radius: 10px !important;
             background-color: #F4F4F4;
             box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);
@@ -489,8 +495,21 @@
 
     <style>
         *{
-            font-family: 'Poppins', sans-serif !important;
+            font-family:  Inter, sans-serif !important;
         }
+        .content{
+            min-height: 70vh;
+        }
+        .tooltip-inner {
+            color: #fff !important;   /* restore white text */
+            background-color: #000 !important; /* keep background black */
+        }
+
+        #current_tile , #main_tile , #mainMenuTiles{
+            font-size: 25px!important;
+            font-weight: 600!important;
+        }
+
     </style>
 
 
@@ -657,6 +676,9 @@
                                         <li>
                                             <a href="<?= base_url('/ticket/feedback-list') ?>">Claim Feedback List</a>
                                         </li>
+                                        <li>
+                                            <a href="<?= base_url('/ticketList?return_type=web') ?>">Ticket List</a>
+                                        </li>
                                     </ul>
                                 </div>
                             </li>
diff --git a/app/Views/leads_dash.php b/app/Views/leads_dash.php
index b6b24fc4..e6874de1 100644
--- a/app/Views/leads_dash.php
+++ b/app/Views/leads_dash.php
@@ -187,14 +187,20 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
 
 
     </div>
-    <div class="row">
-        <div class="status_tile" style="padding-bottom: 10px;padding-left: 17px; margin-left:10px;">
-            <a href="#" onclick="hide_and_show_tile(2)"><i class="fas fa-arrow-left"></i> Back to Overview</a>
+
+
+
+
+    <div class="row d-flex  align-items-center">
+        <div class="status_tile" style="padding-left: 25px;">
+            <a href="#" onclick="hide_and_show_tile('2')" ><b><i class="mdi mdi-chevron-left mdi-36px"></i></b> </a>
         </div>
-        <div class="status_tile" style="padding-left: 30px;">
+        <div class="status_tile" style="padding-left: 15px;">
             <a href="#" id="main_tile">Current Tile : </a>
         </div>
     </div>
+    <br>
+    
     <div class="row">
         <div class="col inside-tab-content-div">
             <?php
@@ -337,12 +343,12 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
 
         if (type == 1 && leadType != null && leadType == 1) {
             $('.leadStatusTitle_1').show();
-            $('#main_tile').text("Viewing Details For : Leads");
+            $('#main_tile').text(" Leads");
 
         }
         if (type == 1 && leadType != null && leadType == 2) {
             $('.leadStatusTitle_2').show();
-            $("#main_tile").text("Viewing Details For : BDS Renewals");
+            $("#main_tile").text(" BDS Renewals");
 
         }
 
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 97d8f40c..682180a8 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -132,8 +132,8 @@ table.dataTable tbody td {
                                     <label>Statement Month<span class="text-danger"></span></label>
                                     <div id="reportrange" class="form-control"
                                         style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="fa fa-calendar"></i>&nbsp;
-                                        <span></span> <i class="fa fa-caret-down"></i>
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index 6408f18f..596f7a21 100755
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -138,8 +138,16 @@
                 </div>
 
                 <div class="col-md-6">
-                    <input type="radio" id="familyFloaterYes" name="family_floater" class="family_floater" value="1"> Yes
-                    <input type="radio" id="familyFloaterNo" name="family_floater" class="family_floater" value="0" style="margin-left:10px">No
+                    
+                  &nbsp;&nbsp;  <input type="radio" id="familyFloaterYes" name="family_floater" class="family_floater" value="1"> 
+                    <label for="familyFloaterYes">Yes</label>
+
+                    <br>
+
+                    <input type="radio" id="familyFloaterNo" name="family_floater" class="family_floater" value="0" style="margin-left:10px">
+                    <label for="familyFloaterNo">No</label>
+
+                    
                 </div>
 
                 <div class="col-md-4">
@@ -150,25 +158,25 @@
                     <table>
                         <tbody>
                             <tr>
-                                <td style="width: 11%;"><span style="margin-right: 20px;">Self:</span></td>
-                                <td style="width: 11%;"><input type="checkbox" style="margin-right: 70px;"
+                                <td style="width: 11%;"><span style="margin-right:20px;color:black;">Self:</span></td>
+                                <td style="width: 11%;"><input type="checkbox" style="margin-right: 70px;color:black;"
                                         name="family_floaters[]" value="self" id="self" checked> </td>
                                 <td style="width: 28%;">
-                                    <div class="self-age"><span style="margin-right: 20px;">Min Age:</span><input
+                                    <div class="self-age"><span style="margin-right:20px;color:black;;">Min Age:</span><input
                                             class="underline-input min_age"
                                             value="<?php echo (isset($self_min_age) && $self_min_age > 0) ? $self_min_age : '18'; ?>"
                                             style="width: 35%;;" type="number" name="self_min_age" id="self_min_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="self-age"><span style="margin-right: 20px;">Max Age:</span><input
+                                    <div class="self-age"><span style="margin-right:20px;color:black;">Max Age:</span><input
                                             class="underline-input max_age"
                                             value="<?php echo  isset($self_max_age) ? $self_max_age : '60'; ?>"
                                             style="width: 35%;;" type="number" name="self_max_age" id="self_max_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <!-- <td style="width: 11%;"><span class="self-age"
-                                        style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
+                                        style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="self-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_self"
                                         id="is_payable_employee_for_self"> </td> -->
@@ -183,25 +191,25 @@
                                 <td></td>
                             </tr>
                             <tr>
-                                <td style="width: 11%;"><span style="margin-right: 20px;">Spouse:</span></td>
+                                <td style="width: 11%;"><span style="margin-right:20px;color:black;">Spouse:</span></td>
                                 <td style="width: 11%;"><input type="checkbox" style="margin-right: 70px;"
                                         name="family_floaters[]" value="spouse" id="spouse"></td>
                                 <td style="width: 28%;">
-                                    <div class="spouse-age"><span style="margin-right: 20px;">Min Age:</span><input
+                                    <div class="spouse-age"><span style="margin-right:20px;color:black;">Min Age:</span><input
                                             class="underline-input min_age"
                                             value="<?php echo  isset($spouse_min_age) ? $spouse_min_age : '18'; ?>"
                                             style="width: 35%;;" type="number" name="spouse_min_age" id="spouse_min_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="spouse-age"><span style="margin-right: 20px;">Max Age:</span><input
+                                    <div class="spouse-age"><span style="margin-right:20px;color:black;">Max Age:</span><input
                                             class="underline-input max_age"
                                             value="<?php echo  isset($spouse_max_age) ? $spouse_max_age : '60'; ?>"
                                             style="width: 35%;;" type="number" name="spouse_max_age" id="spouse_max_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
                                 <!-- <td style="width: 11%;"><span class="spouse-age"
-                                        style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
+                                        style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="spouse-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_spouse"
                                         id="is_payable_employee_for_spouse"> </td> -->
@@ -226,21 +234,21 @@
                                     </select>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="child-age"><span style="margin-right: 20px;">Min Age:</span><input
+                                    <div class="child-age"><span style="margin-right:20px;color:black;">Min Age:</span><input
                                             class="underline-input min_age"
                                             value="<?php echo  isset($child_min_age) ? $child_min_age : '0'; ?>"
                                             style="width: 35%;;" type="number" name="child_min_age" id="child_min_age"
                                             oninput="this.value = this.value.replace(/\D/g, '').substring(0, 2)"></div>
                                 </td>
                                 <td style="width: 28%;">
-                                    <div class="child-age"><span style="margin-right: 20px;">Max Age:</span><input
+                                    <div class="child-age"><span style="margin-right:20px;color:black;">Max Age:</span><input
                                             class="underline-input max_age"
                                             value="<?php echo  isset($child_max_age) ? $child_max_age : '25'; ?>"
                                             style="width: 35%;;" type="number" name="child_max_age" id="child_max_age"
                                             oninput="this.value = this.value.replace(/\D/g, '').substring(0, 2)"></div>
                                 </td>
                                 <!-- <td style="width: 11%;"><span class="child-age"
-                                        style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
+                                        style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="child-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_child"
                                         id="is_payable_employee_for_child"> </td> -->
@@ -261,7 +269,7 @@
                     <div style="margin-top:10px"></div>
 
                     <div style="margin-top:10px">
-                        <span for="family_floaters">Select Other Members:</span>
+                        <span for="family_floaters" style="color:black;">Select Other Members:</span>
                         <select name="family_floaters[]" id="family_floaters" style="margin-left: 10px;">
                             <option value="0">None</option>
                             <option value="1P">Only one parent (Either Father / Mother)</option>
@@ -279,14 +287,14 @@
                             <tbody>
                                 <tr>
                                     <td style="width: 22%;">
-                                        <div class="other-member-age"><span style="margin-right: 20px;">Elders
+                                        <div class="other-member-age"><span style="margin-right:20px;color:black;">Elders
                                                 Count:</span><input class="underline-input" id="member_count"
                                                 style="width: 30%; width: 30%;background: lightgray;" type="number"
                                                 name="elder_member_count" id="member_count" readonly></div>
                                     </td>
                                     <td style="width: 28%;">
                                         <div class="other-member-age" style="margin-left: 32px;"><span
-                                                style="margin-right: 20px;">Min Age:</span><input
+                                                style="margin-right:20px;color:black;">Min Age:</span><input
                                                 class="underline-input min_age"
                                                 value="<?php echo  isset($other_member_min_age) ? $other_member_min_age : '18'; ?>"
                                                 style="width: 35%;;" type="number" class="underline-input min_age"
@@ -295,7 +303,7 @@
                                     </td>
                                     <td style="width: 28%;">
                                         <div class="other-member-age" style="margin-left: 17px;"><span
-                                                style="margin-right: 20px;">Max Age:</span><input
+                                                style="margin-right:20px;color:black;">Max Age:</span><input
                                                 class="underline-input max_age"
                                                 value="<?php echo  isset($other_member_max_age) ? $other_member_max_age : '60'; ?>"
                                                 style="width: 35%;;" type="number" class="underline-input max_age"
@@ -303,7 +311,7 @@
                                                 onchange="lowerIsEighteen(this)"></div>
                                     </td>
                                     <!-- <td style="width: 11%;"><span class="other-member-age"
-                                            style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span>
+                                            style="margin-right:20px;color:black;font-size: 12px;">Is Payable by employee:</span>
                                     </td>
                                     <td style="width: 11%;"><input class="other-member-age" type="checkbox"
                                             style="margin-right: 70px;" name="is_payable_employee_for_elders"
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php
index 52eb4fea..03530e65 100644
--- a/app/Views/policy_transaction_endorsement_list.php
+++ b/app/Views/policy_transaction_endorsement_list.php
@@ -268,8 +268,8 @@ custom-dropdown-menu {
                                 <div class="form-group col-md-3" style="display: none;" id="date_div">
                                     <label>Date<span class="text-danger"></span></label>
                                     <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="fa fa-calendar"></i>&nbsp;
-                                        <span></span> <i class="fa fa-caret-down"></i>
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 8fd2eea3..f4752614 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -836,7 +836,7 @@
 
                             <div class="form-group col-md-3">
                                 <label for="new_vehicle_switch">New Vehicle</label>
-                                <input id="new_vehicle_switch" type="checkbox" name="new_vehicle" value="1"  data-toggle="toggle" data-on="Yes" data-off="No" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218">
+                                <input id="new_vehicle_switch" type="checkbox" name="new_vehicle" value="1"  data-toggle="toggle" data-on="Yes" data-off="No" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218">
                             </div>
                             
                             <div class="form-group col-md-6">
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index cec7a681..cecdbad4 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -239,8 +239,8 @@ table.dataTable tbody td {
                                 <div class="form-group col-md-3" style="display: none;" id="date_div">
                                     <label>Date<span class="text-danger"></span></label>
                                     <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="fa fa-calendar"></i>&nbsp;
-                                        <span></span> <i class="fa fa-caret-down"></i>
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index 04e867e0..88a0c68e 100755
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -39,7 +39,7 @@ body {
                         <h4 style="position: relative;">Policy Type</h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
-                        <a href="<?= base_url("master/policy/list"); ?>"><i class="fas fa-arrow-left" style="font-size: 17px;"></i> </a>
+                        <a href="<?= base_url("master/policy/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div>
                 </div>
                 <ul class="nav nav-pills navtab-bg">
diff --git a/app/Views/pt_form_file_upload_tab.php b/app/Views/pt_form_file_upload_tab.php
index e7c35190..9390d848 100644
--- a/app/Views/pt_form_file_upload_tab.php
+++ b/app/Views/pt_form_file_upload_tab.php
@@ -10,19 +10,19 @@
                 </li>
                 <li class="nav-item">
                     <a href="#KYC-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab2">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">KYC Docs</span>
                     </a>
                 </li>
                 <li class="nav-item" id="hide_file_upload" style="display: none;">
                     <a href="#fileupload" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="kyc_tab">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">File Upload</span>
                     </a>
                 </li>
                 <li class="nav-item" id="hide_vehicle_tab" style="display: none;">
                     <a href="#vehicle-docs-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="vehicle_tab">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">Vehicle Docs</span>
                     </a>
                 </li>
diff --git a/app/Views/renewal_search.php b/app/Views/renewal_search.php
index 341020f9..9aa1b947 100644
--- a/app/Views/renewal_search.php
+++ b/app/Views/renewal_search.php
@@ -16,8 +16,8 @@
                                 <label>Date<span class="text-danger"></span></label>
                                 <div id="reportrange" class="form-control"
                                     style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="fa fa-calendar"></i>&nbsp;
-                                    <span></span> <i class="fa fa-caret-down"></i>
+                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                    <span></span> <i class="mdi mdi-menu-down"></i>
                                 </div>
                                 <input type="hidden" id="startDate" value=<?= $default_start ?>>
                                 <input type="hidden" id="endDate" value=<?= $default_end ?>>
diff --git a/app/Views/report_bds_filter.php b/app/Views/report_bds_filter.php
index 78ea3d46..856854ed 100644
--- a/app/Views/report_bds_filter.php
+++ b/app/Views/report_bds_filter.php
@@ -114,8 +114,8 @@
                                 <div class="form-group col-md-3" style="display: none;" id="date_div">
                                     <label>Date<span class="text-danger"></span></label>
                                     <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="fa fa-calendar"></i>&nbsp;
-                                        <span></span> <i class="fa fa-caret-down"></i>
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
new file mode 100644
index 00000000..cc6f4c11
--- /dev/null
+++ b/app/Views/thz_list.php
@@ -0,0 +1,473 @@
+<style>
+.table th,
+.table td {
+    padding: 8px;
+}
+
+table.dataTable tbody td {
+    padding: 4px 4px !important;
+}
+
+.col-12 {
+
+    max-width: 98% !important;
+}
+
+.dataTables_filter {
+    position: absolute;
+}
+
+.right-align-input {
+    text-align: right;
+}
+
+.addbtnStyle {
+    margin-left: 20px !important;
+}
+</style>
+<style>
+.table th:nth-child(1),
+.table td:nth-child(1) {
+    max-width: 200px !important; 
+    min-width: 100px !important;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+}
+
+#scroll-horizontal-datatable tbody tr:hover {
+    background-color: #e0e0e0;
+}
+
+
+</style>
+
+
+<div class="col-12">
+    <div class="card">
+        <div class="card-body">
+            <div class="row" style="padding-bottom: 10px;">
+                <div class="col-6" style="align-self: center;">
+                    <h4 style="position: relative;">Ticket List </h4>
+                </div>
+
+            </div>
+            <div class="table-responsive">
+                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+                    <thead class="bg-light">
+                        <tr>
+                            <th>Ticket Number</th>
+                            <th>Name</th>
+                            <th>Mobile Number</th>
+                            <th>Email</th>
+                            <th>Emp Code</th>
+                            <th>Policy Number</th>
+                            <th>Ticket Type</th>
+                            <th>Subject</th>
+                            <th>Message</th>
+                            <th>Status</th>
+                            <th>Assignee</th>
+                            <?php if(in_array(get_role_id(), [1,2,3]) ) { ?> <!-- admin,manager,acc.m -->
+                              <th>ACTION</th>
+                            <?php } ?>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php if (isset($ticket_data)) { ?>
+                            <?php foreach($ticket_data as $index => $row){ ?>
+
+                                    <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
+                                    <td><?php echo $row['thz_id']; ?></td>
+                                    <td><?php echo $row['name']; ?></td>
+                                    <td><?php echo $row['mobile']; ?></td>
+                                    <td><?php echo $row['email']; ?></td>
+                                    <td><?php echo $row['empcode']; ?></td>
+                                    <td><?php echo $row['policy_no']; ?></td>
+                                    <td><?php echo $row['ticket_type']; ?></td>
+                                    <td><?php echo $row['subject']; ?></td>
+                                    <td><?php echo $row['message']; ?></td>
+                                    <td><?php echo $row['status']; ?></td>
+                                    <td><?php echo $row['assignee_name']; ?></td>
+                                    <?php if(in_array(get_role_id(), [1,2,3]) ) { ?> <!-- admin,manager,acc.m -->
+                                    <td>
+                                            <div class="btn-group dropdown">
+                                                <button type="button" 
+                                                        class="btn btn-sm btn-primary" 
+                                                        data-id="<?= $row['thz_id']; ?>" 
+                                                        data-assignee="<?= $row['assign_to']; ?>" 
+                                                        data-subject="<?= $row['subject']; ?>"
+                                                        onclick="openAssignee(this)">
+                                                    Assign
+                                                </button>
+                                            </div>
+                                                <!-- <a href="javascript:void(0);" 
+                                                            data-toggle="modal" 
+                                                            data-target="#AssignModal" 
+                                                            data-id="<?= $row['thz_id']; ?>" 
+                                                            data-subject="<?= $row['subject']; ?>">
+                                                                <i class="fa fa-users" 
+                                                                    title="Assign To"
+                                                                    style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
+                                                                    onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
+                                                                    onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
+                                                                </i>
+                                                </a> -->
+                                    </td>
+                                    <?php } ?>
+                                </tr>
+                            <?php } ?>
+                        <?php } ?>
+                    </tbody>
+                </table>
+
+                <div>
+                </div>
+            </div>
+        </div><!-- end col -->
+    </div>
+</div>
+
+<div class="modal fade" id="ticketModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <form id="ticketForm">
+        <div class="modal-header">
+          <h4 class="modal-title" id="modalLabel">New Ticket</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        </div>
+        <div class="modal-body">
+          <div class="form-row">
+            <input type="hidden" id="thz_id" name="thz_id">
+            <input type="hidden" id="return_type" name="return_type">
+
+            <div class="form-group col-md-6">
+              <label for="name">Name<span class="text-danger">*</span></label>
+              <input type="text" class="form-control" id="name" name="name" placeholder="Enter Name" required>
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="mobile">Mobile<span class="text-danger">*</span></label>
+              <input type="text" class="form-control" id="mobile" 
+                     name="mobile" placeholder="Enter Mobile"
+                     pattern="^[0-9]{10}$" required
+                     title="Please enter a valid 10-digit mobile number">
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="email">Email Id<span class="text-danger">*</span></label>
+              <input type="email" class="form-control" id="email" 
+                     name="email" placeholder="Enter Email"
+                     required
+                     pattern="[^@\s]+@[^@\s]+\.[^@\s]+"
+                     title="Please enter a valid email address">
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="empcode">Employee code</label>
+              <input type="text" class="form-control" id="empcode" name="empcode" placeholder="Enter Employee code">
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="policy_no">Policy Number</label>
+              <input type="text" class="form-control" id="policy_no" name="policy_no" placeholder="Enter Policy Number">
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
+              <select class="form-control" id="ticket_type" name="ticket_type" required>
+                <option value="">Select Ticket Type</option>
+                <option value="Sales">Sales</option>
+                <option value="Service">Service</option>
+              </select>
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="subject">Subject</label>
+              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject">
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="message">Message</label>
+              <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
+              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4"></textarea>
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="status">Status</label>
+              <select class="form-control" id="status" name="status">
+                <option value="">Select Status</option>
+                <option value="Open">Open</option>
+                <option value="In Progress">In Progress</option>
+                <option value="Resolved">Resolved</option>
+                <option value="Closed">Closed</option>
+              </select>
+            </div>
+
+            <div class="form-group col-md-6">
+              <label for="assign_to">Assign To</label>
+              <select class="form-control" id="assign_to" name="assign_to">
+                <option value="">Select Assign To</option>
+                <?php if(isset($assignee)) { ?>
+                  <?php foreach ($assignee as $a) { ?>
+                    <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
+                  <?php } ?>
+                <?php } ?>
+              </select>
+            </div>
+
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" onclick="submitTicket()">Submit</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+
+<div class="modal fade" id="AssignModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="assignModalLabel">Ticket</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body">
+        <div class="form-row">
+          <input type="hidden" id="hidden_thz_id" name="hidden_thz_id">
+          <div class="form-group col-md-12">
+            <label for="modal_assignee">Assign To<span class="text-danger">*</span></label>
+            <select class="form-control" id="modal_assignee" name="modal_assignee" required>
+              <option value="">Select Assign To</option>
+              <?php if(isset($assignee)) { ?>
+                <?php foreach ($assignee as $a) { ?>
+                  <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
+                <?php } ?>
+              <?php } ?>
+            </select>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" onclick="updateAssignTo()">Submit</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<script>
+
+    function openTicket(){
+        var form = document.getElementById('ticketForm');
+        form.reset(); 
+        document.getElementById('thz_id').value = '';
+        document.getElementById('modalLabel').innerText = "New Ticket";
+        document.getElementById('return_type').innerText = "WEB";
+        var myModal = new bootstrap.Modal(document.getElementById('ticketModal'));
+        myModal.show();
+    }
+
+    function submitTicket() {
+    var form = document.getElementById('ticketForm');
+
+    // reset any old error styles
+    form.classList.remove('was-validated');
+
+
+    var name      = document.getElementById('name').value.trim();
+    var mobile    = document.getElementById('mobile').value.trim();
+    var email     = document.getElementById('email').value.trim();
+    var ticketType= document.getElementById('ticket_type').value.trim();
+
+    
+    if (name === "" || mobile === "" || email === "" || ticketType === "") {
+        toastr.warning('Please fill all required fields.', 'warning');
+        form.classList.add('was-validated');
+        return;
+    }
+
+    var mobilePattern = /^[0-9]{10}$/;
+    if (!mobilePattern.test(mobile)) {
+        toastr.warning('Please enter a valid 10-digit mobile number.', 'warning');
+        document.getElementById('mobile').focus();
+        return;
+    }
+
+    var emailPattern = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
+    if (!emailPattern.test(email)) {
+        toastr.warning('Please enter a valid email address.', 'warning');
+        document.getElementById('email').focus();
+        return;
+    }
+
+    var form = document.getElementById("ticketForm"); // your form ID
+    var formData = new FormData(form);
+
+    let obj = {};
+    formData.forEach((value, key) => obj[key] = value);
+    // obj["return_type"] = "web";
+
+      $.ajax({
+          url: "<?= base_url('ticketSave') ?>",
+          type: "POST",
+          data: JSON.stringify(obj),   
+          contentType: "application/json", 
+          dataType: 'json',
+          success: function(response) {
+              if (response.status === "success") {
+                  toastr.success(response.message, 'success');
+                  $('#ticketModal').modal('hide');
+                  form.reset();
+                  window.location.href = "<?= base_url('ticketList?return_type=web') ?>";
+              } else {
+                  toastr.error(response.message, 'error');
+              }
+          },
+          error: function(xhr) {
+              toastr.error("Something went wrong!", 'error');
+              console.error(xhr.responseText);
+          }
+      });
+
+
+}
+
+    
+
+
+
+    function openAssignee(button) {
+      document.getElementById('hidden_thz_id').value = "";
+      document.getElementById('modal_assignee').value = "";
+      document.getElementById('assignModalLabel').innerText = "Ticket";
+
+      var id = button.getAttribute('data-id');
+      var subject = button.getAttribute('data-subject');
+      var assignee = button.getAttribute('data-assignee');
+
+      document.getElementById('hidden_thz_id').value = id;
+      document.getElementById('modal_assignee').value = assignee;
+      document.getElementById('assignModalLabel').innerText = "Ticket: " + subject + " (" + id + ")";
+
+      var myModal = new bootstrap.Modal(document.getElementById('AssignModal'));
+      myModal.show();
+    }
+
+
+    function updateAssignTo(){
+        console.log('function called then call the api then refresh the updateAssignTo');
+    }
+
+</script>
+
+
+
+<!-------------------------------------------------------------------------------------------------->
+
+<script>
+$(document).ready(function() {
+    $('[data-toggle="tooltip"]').tooltip();
+    // Initialize select2
+    $("#ticket_type").select2();
+    $("#status").select2();
+    $("#assign_to").select2();
+    $("#modal_assignee").select2();
+});
+
+// Datatable document ready
+$(document).ready(function() {
+
+    var ticketsTable = $('#scroll-horizontal-datatable');
+
+    if (ticketsTable.length) {
+
+        ticketsTable.DataTable({
+            scrollX: true,
+            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+                "<'row'<'col-sm-12'tr>>" +
+                "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+            buttons: [{
+                    extend: 'csv',
+                    text: 'CSV',
+                    title: 'ticket-List',
+                },
+                {
+                    extend: 'excel',
+                    text: 'Excel',
+                    title: 'ticket-List',
+                    exportOptions: {
+                        orthogonal: 'sort'
+                    },
+                },
+                {
+                    text: 'New ticket',
+                    className: 'buttons-html5 addbtnStyle',
+                    action: function(e, dt, node, config) { 
+                        openTicket()
+                    }
+                }
+            ],
+            language: {
+                search: "_INPUT_",
+                searchPlaceholder: "Search..."
+            },
+            paging: true, // Enable pagination
+            pageLength: 25, // Set default number of rows per page (optional)
+            ordering: false,
+        });
+    } else {
+        console.error("Table Not found.");
+    }
+});
+
+function viewTicket(ticket_id){
+
+    // $('.loader').fadeIn();
+    // $('.loader-mask').fadeIn();
+
+    let url = '<?= base_url('ThzControllerview/'); ?>' + ticket_id;
+    window.location.href = url;
+
+
+}
+
+function removeticket(input, ticket_id) {
+
+    confirmActionSweertAlert("Do you want to delete this ticket?", "Yes, Proceed!", "No, Cancel").then((confirmed) => {
+        if (confirmed) {
+            let url = '<?= base_url('ticket/remove') ?>';
+
+            // Include `pt_id` in the AJAX request if necessary
+            let requestData = { ticket_id: ticket_id };
+
+            sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+                console.log('Data fetched successfully:', response);
+
+                if (response.status === true) {
+                    toastr.success(response.message, 'SUCCESS');
+                    window.location.reload();
+                } else {
+                    toastr.warning(response.message, 'WARNING');
+                }
+            }, function(xhr, status, error) {
+                console.error('Error fetching data:', error);
+                console.error(xhr.responseText);
+            });
+        }
+    });
+
+}
+
+$(document).on('click', 'tbody tr', function (e) {
+    // Exclude clicks on any elements inside the last column (actions)
+    if ($(e.target).closest('td').index() !== $(this).children('td').length - 1) {
+        const id = $(this).data('id');
+        console.log('Ticket ID', id)
+        viewTicket(id);
+    }
+});
+
+
+</script>
\ No newline at end of file
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
new file mode 100644
index 00000000..21a1d8d2
--- /dev/null
+++ b/app/Views/thz_notes.php
@@ -0,0 +1,436 @@
+<style>
+.bg-staff {
+    background-color: #FFF5E5;
+}
+</style>
+<div class="row">
+    <div class="col-12">
+        <div class="card" style="margin-right: 23px;">
+            <div class="card-body">
+                <!-- Header Section -->
+                <div class="row mb-3">
+                    <div class="col-6 d-flex align-items-center">
+                        <h4 class="mb-0">Ticket</h4>
+                    </div>
+                    <div class="col-6 text-right">
+                        <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
+                            <i class="fas fa-arrow-left" style="font-size: 17px;"></i>
+                        </a>
+                    </div>
+                </div>
+
+                <!-- Navigation Tabs -->
+                <ul class="nav nav-pills navtab-bg">
+                    <li class="nav-item">
+                        <a href="#general-tab" data-toggle="tab" class="nav-link px-2 py-1 active" id="general_tab"
+                            aria-expanded="true">
+                            <i class="mdi mdi-ticket-account"></i>
+                            <span class="d-none d-sm-inline-block">General</span>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#note-tab" data-toggle="tab" class="nav-link px-2 py-1" id="note_tab"
+                            aria-expanded="false">
+                            <i class="mdi mdi-note-text"></i>
+                            <span class="d-none d-sm-inline-block">Notes</span>
+                        </a>
+                    </li>
+                </ul>
+
+                <!-- Tab Content -->
+                <div class="tab-content">
+                    <div class="tab-pane fade show active" id="general-tab">
+                        <div class="row">
+                            <div class="col-12">
+                                <div class="card-body">
+                                    <form role="form" class="parsley-examples" method="post" id="thz_form_data" onsubmit="submitTicket(event, this)" enctype="multipart/form-data">
+                                        <div class="form-group">
+
+                                            <h5>Ticket Master Details</h5>
+                                            <hr>
+
+                                            <div class="form-row">
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="name">Name<span class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="name" placeholder="Enter Name" name="name" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="mobile">Mobile<span class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="mobile" placeholder="Enter Mobile" name="mobile" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="email">Email Id<span class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="email" placeholder="Enter Email" name="Email" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="empcode">Employee code<span class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="empcode" placeholder="Enter Employee code" name="empcode" required>
+                                                        </div>
+                                                        <div class="form-group col-md-3">
+                                                            <label for="policy_no">Policy Number<span class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="policy_no" placeholder="Enter Policy Number" name="policy_no" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
+                                                            <select class="form-control" id="ticket_type" name="ticket_type" required>
+                                                                <option value="">Select Ticket Type</option>
+                                                                <option value="Sales">Sales</option>
+                                                                <option value="Service">Service</option>
+                                                            </select>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="modal_vehicle_no">Subject<span class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="subject" placeholder="Enter Subject" name="subject" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="message">Message<span class="text-danger">*</span></label>
+                                                            <input type="text" class="form-control" id="message" placeholder="Enter Message" name="message" required>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+                                                            <label for="status">Status<span class="text-danger">*</span></label>
+                                                            <select class="form-control" id="status" name="status" required>
+                                                                <option value="">Select Status</option>
+                                                                <option value="Open">Open</option>
+                                                                <option value="In Progress">In Progress</option>
+                                                                <option value="Resolved">Resolved</option>
+                                                                <option value="Closed">Closed</option>
+                                                            </select>
+                                                        </div>
+
+                                                        <div class="form-group col-md-6">
+                                                            <label for="assign_to">Assign To<span class="text-danger">*</span></label>
+                                                            <select class="form-control" id="Assign_to" name="assign_to" required>
+                                                                <option value="">Select Assignee</option>
+                                                                <?php if(isset($assignee)) { ?>
+                                                                    <?php foreach ($assignee as $value) { ?>
+                                                                        <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
+                                                                    <?php } ?>
+                                                                <?php } ?>
+                                                            </select>
+                                                        </div>
+                                                        <input type="hidden" id="thz_id" name="thz_id">
+
+                                            </div>
+
+                                            <br><br>
+                                        </div>
+                                        <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
+                                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="tab-pane fade" id="note-tab">
+                        <div class="row">
+                            <div class="col-12">
+                                <div class="card-body">
+                                    <form role="form" class="parsley-examples" method="post" id="thz_note_form"
+                                        enctype="multipart/form-data">
+                                        <div class="form-group">
+                                            <div class="form-row">
+                                                <div class="form-group col-md-12">
+                                                    <label for="ticket_note">Add Notes</label>
+                                                    <textarea class="form-control" id="thz_notes" name="notes" rows="3"
+                                                        placeholder="Enter Text"><?= isset($thz_note['notes']) ? $thz_note['notes'] : '' ?></textarea>
+                                                </div>
+                                            </div>
+                                        </div><input type="hidden" id="thz_notes_id">
+                                        <input type="hidden" id="thz_master_id">
+                                        <div class="form-group text-right m-b-0">
+                                            <button type="submit" class="btn btn-primary" id="thz_note_submit">Submit</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div> <!-- end col-->
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- <div class="modal fade" id="member_data_modal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myCenterModalLabel"></h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <div class="form-row">
+                    <div class="form-group col-md-12">
+                        <label for="acm_id">Insured Member<span class="text-danger"></span></label>
+                        <select class="form-control" onchange="setMemberData(this)">
+                            <option value="0">Select Insured Member</option>
+                            <?php if (!empty($member_data)) : ?>
+                            <?php foreach ($member_data as $value) : ?>
+                            <option value="<?= isset($value['emp_code']) ? $value['emp_code'] : '' ?>"
+                                data-empID="<?= isset($value['emp_id']) ? $value['emp_id'] : '' ?>"
+                                data-empName="<?= isset($value['emp_name']) ? htmlspecialchars($value['emp_name'], ENT_QUOTES, 'UTF-8') : '' ?>"
+                                data-policyNo="<?= isset($value['policy_no']) ? $value['policy_no'] : '' ?>"
+                                data-tpaNo="<?= isset($value['tpa_no']) ? $value['tpa_no'] : '' ?>"
+                                data-relationship="<?= isset($value['emp_relationship']) ? htmlspecialchars($value['emp_relationship'], ENT_QUOTES, 'UTF-8') : '' ?>">
+                                <?= isset($value['emp_name']) && isset($value['emp_relationship']) 
+                                    ? htmlspecialchars($value['emp_name'] . ' - ' . $value['emp_relationship'], ENT_QUOTES, 'UTF-8') 
+                                    : 'Unknown Member' ?>
+                            </option>
+                            <?php endforeach; ?>
+                            <?php endif; ?>
+                        </select>
+
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a class="btn btn-primary close" data-dismiss="modal" aria-label="Close">Submit</a>
+            </div>
+        </div>
+    </div>
+</div> -->
+
+<div id="ticket_conversation_div">
+    <?php include("ticket_conversation.php") ?>
+</div>
+
+<?php //include("ticket_form_handler.php") ?>
+
+<script>
+    
+function submitClaimForm(event, form) {
+
+    event.preventDefault();
+
+    var isValid = $('#ticket_form_data').parsley().validate();
+
+    if (!isValid) {
+        toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
+        return false;
+    }
+
+    const formAction = '<?= base_url("ticket/update"); ?>';
+
+    // Show loader
+    $('.loader').fadeIn();
+    $('.loader-mask').fadeIn();
+
+    // Collect IDs and form data
+    const formData = new FormData(form);
+
+    // AJAX request
+    $.ajax({
+        data: formData,
+        url: formAction,
+        type: "POST",
+        dataType: 'json',
+        processData: false,
+        contentType: false,
+        success: function(response) {
+            // Hide loader
+
+            console.log('Form submitted response:', response);
+
+            if (response.status === true) {
+                location.reload();
+                toastr.success(response.message, 'SUCCESS');
+            } else {
+                toastr.error(response.message, 'ERROR');
+            }
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        },
+        error: function(xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+
+            // Hide loader
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        }
+    });
+}
+
+function openFetchEmpDataodal() {
+    var myModal = new bootstrap.Modal(document.getElementById('member_data_modal'));
+    myModal.show();
+}
+
+function setMemberData(input) {is_head_approved
+
+    var selectedOption = $(input).find(':selected');
+
+    // Retrieve the data-* attributes
+    var empId = selectedOption.data('empid');
+    var empName = selectedOption.data('empname');
+    var policyNo = selectedOption.data('policyno');
+    var tpaNo = selectedOption.data('tpano');
+    var relationship = selectedOption.data('relationship');
+
+    $('#tpa_no').val(tpaNo);
+    $('#insured_emp_id').val(empId);
+    $('#insured_name').val(empName);
+    $('#policy_no').val(policyNo);
+
+    $('#relationship option').each(function() {
+        if ($(this).text() === relationship) {
+            $(this).prop('selected', true);
+        }
+    });
+}
+
+function showConfirmationModal(event) {
+    Swal.fire({
+        title: "Approve Claim Rejection",
+        // text: "Do you want to save this?",
+        icon: "warning",
+        showCancelButton: true,
+        showDenyButton: true, 
+        confirmButtonColor: "#3085d6",
+        cancelButtonColor: "#6c757d",
+        denyButtonColor: "#d33",
+        confirmButtonText: "Approve",
+        denyButtonText: "Reject",
+        cancelButtonText: "Cancel"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $('#is_head_approved').val(1);
+            console.log($('#ticket_form_data')[0])
+            submitClaimForm(event, $('#ticket_form_data')[0]); // Fixed selector
+        } else if (result.isDenied) {
+            // Show second Swal for rejection reason
+            Swal.fire({
+                title: "Rejection Reason",
+                text: "Please provide a reason for rejection",
+                input: "textarea",
+                inputPlaceholder: "Enter your reason here...",
+                icon: "info",
+                showCancelButton: true,
+                confirmButtonColor: "#3085d6",
+                cancelButtonColor: "#6c757d",
+                confirmButtonText: "Submit",
+                cancelButtonText: "Back"
+            }).then((reasonResult) => {
+                if (reasonResult.isConfirmed) {
+                    // Check if reason is not empty
+                    if (reasonResult.value && reasonResult.value.trim() !== "") {
+                        $('#is_head_approved').val(2);
+                        $('#rejection_reason').val(reasonResult.value.trim());
+                        console.log($('#ticket_form_data')[0]);
+                        $('#head_rejection_reason').val(reasonResult.value.trim());
+                        submitClaimForm(event, $('#ticket_form_data')[0]);
+                    } else {
+                        // Alert if reason is empty
+                        Swal.fire({
+                            title: "Error",
+                            text: "Rejection reason cannot be empty",
+                            icon: "error",
+                            confirmButtonColor: "#3085d6"
+                        }).then(() => {
+                            // Go back to the rejection reason dialog
+                            showConfirmationModal(event);
+                        });
+                    }
+                } else {
+                    // If canceled, go back to first Swal
+                    showConfirmationModal(event);
+                }
+            });
+        } else {
+            $('#is_head_approved').val(0);
+            return false;
+        }
+    });
+}
+
+</script>
+<script>
+$(document).ready(function() {
+        // Initialize select2
+        $("#ticket_type").select2();
+        $("#status").select2();
+        $("#assign_to").select2();
+    
+    url = '<?= base_url('ThzControllernote/1'); ?>';
+    data = { id : $('#thz_master_id').val(), is_auto_query : 0};
+    $.ajax({
+        url:url,
+        data:data,
+        type:'POST',
+        success: function(res) {
+            if (res.status == true){
+                $('#thz_master_id').val(res.data.thz_id);
+                $('#thz_notes').val(res.data.notes);
+                $('#thz_notes_id').val(res.data.id);
+                $('#thz_notes_by').val('Staff');
+            }
+        },
+        error: function (xhr, status, error) {
+            console.error(xhr.responseText);
+            console.error(status, error);
+            setTimeout(function() {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                toastr.warning('Something Went Wrong!', 'warning');
+            }, 1000);
+        }
+    })
+
+    $("#ticket_note_form").submit(function(event) {
+
+        event.preventDefault();
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
+
+        var url = '<?= base_url("/ThzControllernote/2"); ?>';
+        var formData = $(this).serializeArray();
+        var ticket_id = $('#thz_master_id').val();
+        if (ticket_id != null && ticket_id != ''){
+            formData.push({ name: 'thz_id', value: ticket_id});
+        }
+        var primary_key = $('#thz_note_id').val();
+        if (primary_key != null && primary_key != ''){
+            formData.push({ name: 'id', value: primary_key});
+        }
+        console.log(formData);
+        sendAjaxRequestForGlobal(url, 'POST', formData, function(response) {
+            if (response.status == true) {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                toastr.success('Note Added Successfully','Success');
+                // console.log("Respone id is ")
+                // console.log(response.id);    
+                $('#note_id').val(response.id);
+                // console.log($('#'))
+
+
+            } else {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
+            }
+
+
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while fetching the report page.', 'ERROR');
+
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        });
+    });
+
+});
+
+</script>
\ No newline at end of file
diff --git a/app/Views/ticket_conversation.php b/app/Views/ticket_conversation.php
index d2fa00c3..13707a84 100644
--- a/app/Views/ticket_conversation.php
+++ b/app/Views/ticket_conversation.php
@@ -23,7 +23,7 @@
             </div>
             <div class="col">
                 <div class="mb-3">
-                    <div class="text-muted"><i class="fa fa-calendar"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
+                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
                 </div>
                 <div id="msg_388" class="form-group">
                     <p><?= $message['mail_content'] ?></p> 
@@ -58,7 +58,7 @@
             </div>
             <div class="col">
                 <div class="mb-3">
-                    <div class="text-muted"><i class="fa fa-calendar"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
+                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
                 </div>
                 <div id="msg_394" class="form-group">
                     <p><?= $message['mail_content'] ?></p>
diff --git a/app/Views/ticket_edit_onbording.php b/app/Views/ticket_edit_onbording.php
index c84a7206..5a6812ac 100644
--- a/app/Views/ticket_edit_onbording.php
+++ b/app/Views/ticket_edit_onbording.php
@@ -14,7 +14,7 @@
                     </div>
                     <div class="col-6 text-right">
                         <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
-                            <i class="fas fa-arrow-left" style="font-size: 17px;"></i>
+                            <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i>
                         </a>
                     </div>
                 </div>
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index 56e299aa..2d8c2aa2 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -36,7 +36,7 @@
                         </div>
                         <div class="col-6 text-right">
                             <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
-                                <i class="fas fa-arrow-left" style="font-size: 17px;"></i>
+                                <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i>
                             </a>
                         </div>
                     </div>
@@ -58,7 +58,7 @@
                         <div class="form-row">
 
                             <div class="form-group col-md-3">
-                                <label for="emp_code">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="fa fa-search text-danger"
+                                <label for="emp_code">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="mdi mdi-magnify text-danger"
                                         aria-hidden="true" onclick="openFetchEmpDataodal(this)"></i> <span
                                         class="text-danger"></span></label>
                                 <input type="text" class="form-control" id="emp_code" placeholder="Enter Employee ID"
diff --git a/app/Views/ticket_form_gpa.php b/app/Views/ticket_form_gpa.php
index 84bedac6..a25d03e7 100644
--- a/app/Views/ticket_form_gpa.php
+++ b/app/Views/ticket_form_gpa.php
@@ -30,7 +30,7 @@
                         </div>
                         <div class="col-6 text-right">
                             <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
-                                <i class="fas fa-arrow-left" style="font-size: 17px;"></i>
+                                <i class="mdi mdi-arrow-left" style="font-size: 17px;"></i>
                             </a>
                         </div>
                     </div>
@@ -51,7 +51,7 @@
                         <div class="form-row">
 
                             <div class="form-group col-md-3">
-                                <label for="emp_code">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="fa fa-search text-danger"
+                                <label for="emp_code">Employee ID <span class="text-danger">*</span> &nbsp; &nbsp; <i class="mdi mdi-magnify text-danger"
                                         aria-hidden="true" onclick="openFetchEmpDataodal(this)"></i> <span class="text-danger"></span></label>
                                 <input type="text" class="form-control" id="emp_code" placeholder="Enter Employee ID"
                                     value="<?= isset($ticket_data['emp_code']) ? $ticket_data['emp_code'] : '' ?>"
diff --git a/app/Views/ticket_mail_template.php b/app/Views/ticket_mail_template.php
index 9f67a034..5d69d8d9 100644
--- a/app/Views/ticket_mail_template.php
+++ b/app/Views/ticket_mail_template.php
@@ -23,6 +23,7 @@
 
     .addbtnStyle {
         margin-left: 20px !important;
+        color: #000;
     }
 
     .custom-dropdown-menu {
@@ -51,6 +52,13 @@
         color: #16181b !important;
         cursor: pointer !important;
     }
+    /* strongest, beats most parent rules and pasted styles on wrappers */
+    .jodit-container .jodit-wysiwyg,
+    .jodit-container .jodit-wysiwyg * {
+    color: #000 !important;
+    background-color: #fff !important; /* optional: ensure white background */
+    }
+
 </style>
 
 <div class="col-12">
@@ -279,6 +287,9 @@
             toolbarAdaptive: false,
             saveHeightInStorage: true,
             minHeight: 400,
+            defaultStyle: {
+                color: '#000000'  // 👈 force black text
+            },
             extraButtons: [{
                 name: 'info',
                 iconURL: '<?= base_url() . "public"; ?>/assets/images/image-solid.svg', // Replace with the actual icon URL
diff --git a/app/Views/ticket_reports.php b/app/Views/ticket_reports.php
index 4fe9732d..57c73a2e 100644
--- a/app/Views/ticket_reports.php
+++ b/app/Views/ticket_reports.php
@@ -15,8 +15,8 @@
                             <div class="form-group col-md-4" id="date_div">
                                 <label>Date<span class="text-danger"></span></label>
                                 <div id="reportrange" class="form-control" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="fa fa-calendar"></i>&nbsp;
-                                    <span></span> <i class="fa fa-caret-down"></i>
+                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                    <span></span> <i class="mdi mdi-menu-down"></i>
                                 </div>
                                 <input type="hidden" id="startDate" value=<?= $default_start ?>>
                                 <input type="hidden" id="endDate" value=<?= $default_end ?>>
diff --git a/app/Views/tpa_list.php b/app/Views/tpa_list.php
index d6d44e58..a2a1b5eb 100755
--- a/app/Views/tpa_list.php
+++ b/app/Views/tpa_list.php
@@ -25,7 +25,21 @@
     background-color: #f8f9fa !important;
     color: #16181b !important;
     cursor: pointer !important;
-}   </style>
+}   
+
+.btn-color{
+  background-color: rgba(52, 174, 178, 1);
+  color: white;
+  border:1px solid rgba(52, 174, 178, 1);
+}
+
+.btn-color:hover{
+    background-color: rgba(41, 139, 142, 1);
+    color: white;
+    border:1px solid  rgba(41, 139, 142, 1);
+}
+
+</style>
 <div class="row" id="tpa_list">
     <div class="col-12">
         <div class="card">
@@ -34,9 +48,6 @@
                         <div class="col-6" style="align-self: center;">
                             <h4 style="position: relative;">TPA List</h4>
                         </div>
-                        <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                            <a href="<?= base_url("master/tpa/create"); ?>" type="button" id="btnAdd" class="btn btn-primary waves-effect waves-light" data-toggle="" data-placement="top" title="Add" data-trigger="hover">ADD</a>                
-                        </div>
                     </div>
                 <table class="table table-sm table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
                     id="tickets-table">
@@ -176,7 +187,15 @@ document.addEventListener("DOMContentLoaded", function () {
                 exportOptions: {
                     columns: ':not(:last-child)'
                 }
+            },
+            {
+                text: 'ADD',
+                className: 'btn btn-color',
+                action: function () {
+                    window.location.href = "<?= base_url("master/tpa/create"); ?>";
+                }
             }
+
         ],
 
 
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index 2d6196aa..107d61f9 100755
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -39,7 +39,7 @@ body {
                         <h4 style="position: relative;">TPA</h4>
                     </div>
                     <div class="col-6" style="text-align: right;">
-                        <a href="<?= base_url("master/tpa/list"); ?>"><i class="fas fa-arrow-left" style="font-size: 17px;"></i> </a>
+                        <a href="<?= base_url("master/tpa/list"); ?>"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i> </a>
                     </div>
                 </div>
                 <ul class="nav nav-pills navtab-bg">
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 28d85d44..71c7c8ac 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -124,8 +124,8 @@ table.dataTable tbody td {
                                     <label>Date<span class="text-danger"></span></label>
                                     <div id="reportrange" class="form-control"
                                         style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                        <i class="fa fa-calendar"></i>&nbsp;
-                                        <span></span> <i class="fa fa-caret-down"></i>
+                                        <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                        <span></span> <i class="mdi mdi-menu-down"></i>
                                     </div>
                                     <input type="hidden" id="startDate">
                                     <input type="hidden" id="endDate">
diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php
index af49272b..51311552 100644
--- a/app/Views/vehicle_master_list.php
+++ b/app/Views/vehicle_master_list.php
@@ -48,6 +48,18 @@ table.dataTable tbody td {
     cursor: pointer !important;
 }   
 
+    .btn-color{
+        background-color: rgba(52, 174, 178, 1);
+        color: white;
+        border:1px solid rgba(52, 174, 178, 1);
+    }
+
+    .btn-color:hover{
+        background-color: rgba(41, 139, 142, 1);
+        color: white;
+        border:1px solid  rgba(41, 139, 142, 1);
+    }
+
 </style>
 
 <div class="row" id="client_list">
@@ -58,10 +70,6 @@ table.dataTable tbody td {
                     <div class="col-6" style="align-self: center;">
                         <h4 style="position: relative;">Vehicle Master List</h4>
                     </div>
-                    <div class="col-6" style="text-align: right; position: relative;top: 56px;">
-                        <button type="button" id="btnAdd" class="btn btn-primary"
-                            onclick="showModal('add')">ADD</button>
-                    </div>
                 </div>
                 <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead class="bg-light">
@@ -461,7 +469,8 @@ $(document).ready(function() {
         dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
             "<'row'<'col-sm-12'tr>>" +
             "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-        buttons: [{
+        buttons: [
+            {
             extend: 'csv',
             text: 'CSV',
             title: 'Vehicle-Master-List',
@@ -469,7 +478,19 @@ $(document).ready(function() {
             exportOptions: {
                 columns: ':not(:last-child)'
             },
-        }],
+            },
+            {
+                text: 'ADD',
+                className: 'btn-color',
+                attr: {
+                    id: 'btnAdd',
+                    title: 'Add'
+                },
+                action: function () {
+                    showModal('add')
+                }
+            }
+    ],
         language: {
             search: "_INPUT_",
             searchPlaceholder: "Search..."
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index 30ee261a..3f18ce81 100755
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -86,7 +86,7 @@
 
                 <div class="row">
                     <div class="col-12" style="text-align: right;">
-                        <a href="<?= base_url("client/deposit/$clientData->id"); ?>"><i class="fas fa-arrow-left"
+                        <a href="<?= base_url("client/deposit/$clientData->id"); ?>"><i class="mdi mdi-arrow-left"
                                 style="font-size: 17px;"></i></a>
                     </div>
                 </div>
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index 9e906235..87085a6d 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -567,7 +567,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_cd_switch">CD Entry</label>
-                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218" <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
+                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
                         </div>
 
                         <div class="form-group col-md-3">
@@ -591,7 +591,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_installment_switch">Installment </label>
-                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
+                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
                         </div>
 
                         <div class="form-group col-md-3" style="<?= (!empty($lead_data['is_installment']) && $lead_data['is_installment'] == 1) ? 'display: block;' : 'display: none;' ?>">
diff --git a/app/Views/view_rfq_non_eb.php b/app/Views/view_rfq_non_eb.php
index 8e75cf94..89cf7748 100644
--- a/app/Views/view_rfq_non_eb.php
+++ b/app/Views/view_rfq_non_eb.php
@@ -461,7 +461,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_cd_switch">CD Entry</label>
-                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218"  <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
+                            <input id="is_cd_switch" type="checkbox"  name = "is_cd" value = "1"  data-toggle="toggle" data-on="With CD" data-off="Without CD" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218"  <?= isset($lead_data['is_cd']) && $lead_data['is_cd'] != 1 ? '' : 'checked' ?>>
                         </div>
 
                         <div class="form-group col-md-3">
@@ -485,7 +485,7 @@
 
                         <div class="form-group col-md-3">
                             <label for="is_installment_switch">Installemnt </label>
-                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="dark" data-style="border" data-width="218" style="height: 37.53px;" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
+                            <input id="is_installment_switch" type="checkbox"  name = "is_installment" value = "1"  data-toggle="toggle" data-on="With Installments" data-off="Without Installments" data-onstyle="info" data-offstyle="primary" data-style="border" data-width="218" style="height: 37.53px;" <?= isset($lead_data['is_installment']) && $lead_data['is_installment'] == 1 ? 'checked' : '' ?>>
                         </div>
 
                         <div class="form-group col-md-3" style="<?= (!empty($lead_data['is_installment']) && $lead_data['is_installment'] == 1) ? 'display: block;' : 'display: none;' ?>">
diff --git a/public/assets/js/pages/treeview.init.js b/public/assets/js/pages/treeview.init.js
index 400c7029..33a26040 100755
--- a/public/assets/js/pages/treeview.init.js
+++ b/public/assets/js/pages/treeview.init.js
@@ -1 +1 @@
-$(document).ready(function(){$("#basicTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"mdi mdi-folder-star text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types"]}),$("#checkTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"fa fa-file text-primary"}},plugins:["types","checkbox"]}),$("#dragTree").jstree({core:{check_callback:!0,themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"fa fa-file text-primary"}},plugins:["types","dnd"]}),$("#ajaxTree").jstree({core:{check_callback:!0,themes:{responsive:!1},data:{url:function(e){return"#"===e.id?"../assets/data/ajax_roots.json":"../assets/data/ajax_children.json"},data:function(e){return{id:e.id}}}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"fa fa-file text-primary"}},plugins:["contextmenu","dnd","search","state","types","wholerow"]})});
\ No newline at end of file
+$(document).ready(function(){$("#basicTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"mdi mdi-folder-star text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types"]}),$("#checkTree").jstree({core:{themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types","checkbox"]}),$("#dragTree").jstree({core:{check_callback:!0,themes:{responsive:!1}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["types","dnd"]}),$("#ajaxTree").jstree({core:{check_callback:!0,themes:{responsive:!1},data:{url:function(e){return"#"===e.id?"../assets/data/ajax_roots.json":"../assets/data/ajax_children.json"},data:function(e){return{id:e.id}}}},types:{default:{icon:"fa fa-folder text-warning"},file:{icon:"mdi mdi-file text-primary"}},plugins:["contextmenu","dnd","search","state","types","wholerow"]})});
\ No newline at end of file
diff --git a/public/assets/libs/bootstrap-daterangepicker/index.html b/public/assets/libs/bootstrap-daterangepicker/index.html
index 4621257c..459d6138 100755
--- a/public/assets/libs/bootstrap-daterangepicker/index.html
+++ b/public/assets/libs/bootstrap-daterangepicker/index.html
@@ -31,7 +31,7 @@
         <nav class="navbar navbar-expand-sm navbar-dark bg-dark" style="padding: 0; justify-content: space-between">
             <div class="container">
                 <ul class="navbar-nav">
-                    <li class="nav-item" style="padding-left: 0"><a class="nav-link" href="/" style="color: #eeeeee"><i class="fa fa-calendar"></i>&nbsp; Date Range Picker</a></li>
+                    <li class="nav-item" style="padding-left: 0"><a class="nav-link" href="/" style="color: #eeeeee"><i class="mdi mdi-calendar-blank"></i>&nbsp; Date Range Picker</a></li>
                 </ul>
                 <ul class="navbar-nav">
                     <li class="nav-item"><a class="nav-link" href="https://www.improvely.com" style="color: #33beff"><i class="fa fa-chart-bar"></i>&nbsp; Improvely</a></li>
@@ -235,8 +235,8 @@
                                 <label>Produces:</label>
 
                                 <div id="reportrange" class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="fa fa-calendar"></i>&nbsp;
-                                    <span></span> <i class="fa fa-caret-down"></i>
+                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                    <span></span> <i class="mdi mdi-menu-down"></i>
                                 </div>
 
                                 <script type="text/javascript">
diff --git a/public/assets/libs/bootstrap-daterangepicker/website/index.html b/public/assets/libs/bootstrap-daterangepicker/website/index.html
index 0954e5f1..407c4bfb 100755
--- a/public/assets/libs/bootstrap-daterangepicker/website/index.html
+++ b/public/assets/libs/bootstrap-daterangepicker/website/index.html
@@ -31,7 +31,7 @@
         <nav class="navbar navbar-expand-sm navbar-dark bg-dark" style="padding: 0; justify-content: space-between">
             <div class="container">
                 <ul class="navbar-nav">
-                    <li class="nav-item" style="padding-left: 0"><a class="nav-link" href="/" style="color: #eeeeee"><i class="fa fa-calendar"></i>&nbsp; Date Range Picker</a></li>
+                    <li class="nav-item" style="padding-left: 0"><a class="nav-link" href="/" style="color: #eeeeee"><i class="mdi mdi-calendar-blank"></i>&nbsp; Date Range Picker</a></li>
                 </ul>
                 <ul class="navbar-nav">
                     <li class="nav-item"><a class="nav-link" href="https://www.improvely.com" style="color: #33beff"><i class="fa fa-chart-bar"></i>&nbsp; Improvely</a></li>
@@ -235,8 +235,8 @@
                                 <label>Produces:</label>
 
                                 <div id="reportrange" class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-                                    <i class="fa fa-calendar"></i>&nbsp;
-                                    <span></span> <i class="fa fa-caret-down"></i>
+                                    <i class="mdi mdi-calendar-blank"></i>&nbsp;
+                                    <span></span> <i class="mdi mdi-menu-down"></i>
                                 </div>
 
                                 <script type="text/javascript">