diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index a9fa464f0..b2d6d1781 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -5,8 +5,8 @@ planner = self;
 </zscript>
 
     <borderlayout sclass="plannerlayout" width="auto">
-       <north height="30px" border="0">
-       <hbox align="center" id="toolbar" sclass="toolbar-box">
+       <north height="30px" border="0" sclass="toolbar-box">
+       <hbox align="center" id="toolbar">
         <separator/>
         <!--  Commands -->
         <button onClick="planner.invalidate()"
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 c9539ac32..046e00aba 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -218,7 +218,7 @@ button.z-button {
 
 .planner-command.clicked .z-button-cm {
     background-color: #A1D586; /* green2 (active background)*/
-    border-right: 1px solid #439e32;
+    border-right: 0px;
     border-bottom: 1px solid #439e32;
     border-top: 2px solid #3f5917;
     border-left: 2px solid #3f5917;
@@ -1180,4 +1180,23 @@ tr.z-tree-row-seld, tr.z-list-item-seld,
 
 .help-tooltip {
     cursor: help;
-}
\ No newline at end of file
+}
+
+
+.toolbar-box .z-button-cm  {
+    background-color: transparent;
+    border-color:transparent;
+}
+
+.toolbar-box .z-button-cm:hover  {
+    background-color: #E6F2F9;
+    border-color:#006699 #DFF5FE #DFF5FE #006699;
+}
+
+.toolbar-box {
+    background:transparent url(/navalplanner-webapp/zkau/web/zkex/zul/img/layout/borderlayout-hm.png) repeat-x scroll 0 0;
+    border-bottom:1px solid #9ECAD8;
+    font-size:11px;
+}
+
+
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_filter.png b/navalplanner-webapp/src/main/webapp/common/img/ico_filter.png
new file mode 100644
index 000000000..83890a8d7
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_filter.png differ
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
index 6b96d7d17..9d9c6de05 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
@@ -12,7 +12,7 @@
     <label value="${i18n:_('name')}"/>
     <textbox id="filterNameOrderElement" width="50px"
         onOK="treeController.onApplyFilter()" />
-    <button label="${i18n:_('Filter')}" style="margin-top: -4px"
+    <button image="/common/img/ico_filter.png" style="margin-top: -4px"
         tooltiptext="${i18n:_('Apply filtering to order elements satisfying required critera')}"
         onClick="treeController.onApplyFilter()"/>
 </hbox>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul b/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
index 175b505d5..9e51b766c 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
@@ -7,10 +7,10 @@
     <datebox id="filterStartDate" constraint = "@{orderFilterController.checkConstraintStartDate}"/>
     <label value="${i18n:_('to')}"/>
     <datebox id="filterFinishDate" constraint = "@{orderFilterController.checkConstraintFinishDate}"/>
-    <label value="${i18n:_('include order elements')}"/>
+    <label value="${i18n:_('sub elements')}"/>
     <checkbox id="checkIncludeOrderElements"
         tooltiptext="${i18n:_('Apply filtering to order elements satisfying required criteria')}" />
-    <button label="${i18n:_('Filter')}" style="margin-top: -4px"
+    <button image="/common/img/ico_filter.png" style="margin-top: -4px"
         tooltiptext="${i18n:_('Apply filtering to order elements satisfying required criteria')}"
         onClick="orderFilterController.onApplyFilter()"/>
-</hbox>
\ No newline at end of file
+</hbox>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
index e78c48fe0..fc40e0094 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
@@ -25,8 +25,8 @@
 ]]>
 </zscript>
     <borderlayout sclass="orderslayout" width="auto" apply="${orderController}">
-       <north height="30px" border="0">
-       <hbox align="center" id="toolbar" sclass="toolbar-box">
+       <north height="30px" border="0" sclass="toolbar-box">
+       <hbox align="center" id="toolbar">
             <templateFinderPopup id="templateFinderPopup" acceptButtonLabel="${i18n:_('Create Order')}" caption="${i18n:_('Choosing Template')}" />
 
             <button id="createOrderButton" image="/common/img/ico_add.png" sclass="planner-icon"
diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index fd323dab4..38c906cd2 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -32,8 +32,8 @@
     </div>
 
     <borderlayout id="normalLayout" width="auto" apply="${advancedAllocationController}" class="advancedallocationlayout">
-       <north height="30px" border="0">
-       <hbox align="center" sclass="toolbar-box">
+       <north height="30px" border="0" sclass="toolbar-box">
+       <hbox align="center">
         <button label="${i18n:_('Accept')}" id="acceptButton" class="save-button global-action"
             if="${advancedAllocationController.advancedAllocationOfSingleTask}" />
         <button label="${i18n:_('Cancel')}" id="cancelButton" class="cancel-button global-action"
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index 5ebaeef35..d819b5434 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -463,6 +463,10 @@ tr.z-vbox-sep {
     background-color: #ff5a11;
 }
 
+.NO_LOAD {
+   border-left: 0;
+}
+
 .row_resourceload {
     height: 10px;
     border: 1px;