diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java
index 66b9ff8a3..1d1d6c912 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java
@@ -381,4 +381,14 @@ public class SchedulingState {
         }
     }
 
+    public String getCssClass() {
+        String cssclass = "not-scheduled";
+        if (isCompletelyScheduled()) {
+            cssclass = "completely-scheduled";
+        } else if (isPartiallyScheduled()) {
+            cssclass = "partially-scheduled";
+        }
+        return cssclass;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
index cd09d2db1..8cc48324f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
@@ -212,7 +212,9 @@ public class PlanningTabCreator {
 
                     Label schedulingStateLabel = new Label(order
                             .getSchedulingState().getStateAbbreviation());
-                    schedulingStateLabel.setSclass("scheduling-state");
+
+                    schedulingStateLabel.setSclass("scheduling-state "
+                            + order.getSchedulingState().getCssClass());
                     schedulingStateLabel.setTooltiptext(order
                             .getSchedulingState().getStateName());
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
index 0d16c7ef8..63f8c99a2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
@@ -441,13 +441,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
                 T currentElement);
 
         private String getDecorationFromState(SchedulingState state) {
-            String cssclass = "not-scheduled";
-            if (state.isCompletelyScheduled()) {
-                cssclass = "completely-scheduled";
-            } else if (state.isPartiallyScheduled()) {
-                cssclass = "partially-scheduled";
-            }
-            return cssclass;
+            return state.getCssClass();
         }
 
         protected abstract void addCodeCell(final T element);
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index f33b0bfbd..2bec7f175 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -890,11 +890,13 @@ div.z-listbox-pgi-b {
     border-bottom:dotted #EEEEEE 1px;
 }
 
-.orderTree .partially-scheduled span.scheduling-state {
+.partially-scheduled span.scheduling-state,
+span.partially-scheduled {
     background-color: #fddf9b;
 }
 
-.orderTree .completely-scheduled span.scheduling-state {
+.completely-scheduled span.scheduling-state,
+span.completely-scheduled {
     background-color: #bee5a9;
 }
 
@@ -1265,7 +1267,7 @@ overflow: visible;
 
 
 .clickable-rows tr.z-row:hover .z-row-inner {
-    background-color: #BCD2EF;
+    background-color: #E9F2FB;
 }
 
 .clickable-rows tr.z-row:hover .z-row-cnt {