diff --git a/public/assets/css/style.css b/public/assets/css/style.css
index 140966da..4b69c445 100644
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@@ -155,6 +155,29 @@ span.has-danger,
 	color: #fff !important;
 }
 
+.m-table__row--is_in_progress td {
+        background-color: #FFA500 !important;
+    color: #fff !important;
+}
+
+.m-table__row--is_in_progress td > span,
+.m-table__row--is_in_progress td > span a,
+.m-table__row--is_in_progress td > span a i {
+        color: #fff !important;
+}
+
+.m-table__row--is_assigned td {
+        background-color: #0000ff !important;
+    color: #fff !important;
+}
+
+.m-table__row--is_assigned td > span,
+.m-table__row--is_assigned td > span a,
+.m-table__row--is_assigned td > span a i {
+        color: #fff !important;
+}
+
+
 .m-datatable.m-datatable--default > .m-datatable__table {
 	min-height: 0 !important;
 }
@@ -358,4 +381,4 @@ span.has-danger,
 
 .map-info .m-badge {
 	border-radius: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/job-order/cmb.list.all.html.twig b/templates/job-order/cmb.list.all.html.twig
index 1e8b6511..ae0cc4c7 100644
--- a/templates/job-order/cmb.list.all.html.twig
+++ b/templates/job-order/cmb.list.all.html.twig
@@ -94,8 +94,12 @@
                 },
                 rows: {
                     beforeTemplate: function (row, data, index) {
-                        if (data.flag_advance) {
-                            $(row).addClass('m-table__row--danger');
+                        if (data.status == 'In Progress') {
+                            $(row).addClass('m-table__row--is_in_progress');
+                        }
+
+                        if (data.status == 'Assigned') {
+                            $(row).addClass('m-table__row--is_assigned');
                         }
                     }
                 },
diff --git a/templates/job-order/cmb.list.open.html.twig b/templates/job-order/cmb.list.open.html.twig
index a575e645..f7b96452 100644
--- a/templates/job-order/cmb.list.open.html.twig
+++ b/templates/job-order/cmb.list.open.html.twig
@@ -93,12 +93,12 @@
                 },
                 rows: {
                     beforeTemplate: function (row, data, index) {
-                        if (data.flag_advance) {
-                            $(row).addClass('m-table__row--danger');
+                        if (data.status == 'In Progress') {
+                            $(row).addClass('m-table__row--is_in_progress');
                         }
 
-                        if (data.is_mobile) {
-                            $(row).addClass('m-table__row--is_mobile');
+                        if (data.status == 'Assigned') {
+                            $(row).addClass('m-table__row--is_assigned');
                         }
                     }
                 },