diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java
index b1248e1c2..d3ae1e8d9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java
@@ -63,11 +63,21 @@ public class SchedulingStateToggler extends HtmlMacroComponent {
 
     public String getButtonLabel() {
         if (state.isCompletelyScheduled()) {
-            return _("completely scheduled");
+            return _("C");
         } else if (state.isPartiallyScheduled()) {
-            return _("partially scheduled");
+            return _("P");
         } else {
-            return _("no scheduled");
+            return _("U");
+        }
+    }
+
+    public String getButtonTextTooltip() {
+        if (state.isCompletelyScheduled()) {
+            return _("Completely scheduled");
+        } else if (state.isPartiallyScheduled()) {
+            return _("Partially scheduled");
+        } else {
+            return _("Unscheduled");
         }
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
index 7ca7aae89..43db4ddeb 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -777,6 +777,20 @@ div.z-listbox-pgi-b {
     padding-right:2px;
 }
 
+.orderTree .not-scheduled span.z-label,
+.orderTree .partially-scheduled span.z-label,
+.orderTree .completely-scheduled span.z-label {
+    -moz-border-radius-bottomleft: 6px;
+    -moz-border-radius-bottomright: 1px;
+    -moz-border-radius-topleft: 1px;
+    -moz-border-radius-topright: 6px;
+    border: 1px solid #888888;
+    color: #888888;
+    margin: 1px 6px;
+    padding: 2px 5px;
+    font-weight: bold;
+}
+
 .orderTree .not-scheduled,
 .orderTree .partially-scheduled,
 .orderTree .completely-scheduled {
@@ -791,10 +805,14 @@ div.z-listbox-pgi-b {
     background-color: #bee5a9;
 }
 
-span.z-dottree-ico, span.z-dottree-line {
+span.z-dottree-ico {
     min-height:22px;
 }
 
+span.z-dottree-line {
+    min-height:28px;
+}
+
 
 /* --- START -- menubar --
 =================================================== */