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 d1defa2fb..2ae8d0fc5 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -190,9 +190,179 @@ table {
     font-weight:bold;
 }
 
-.icono .zk .z-button-cm, .icono .z-button-cm {
+.zk .z-window-embedded .icono .z-button-cm {
     color: #007bbe;
     background-color: transparent;
     background-image: none;
     border: 0px solid #007bbe;
+    padding: 0px;
+}
+
+
+/* ------ Overridden norrmoz.css.dsp styles ------ */
+
+.z-label, .z-radio-cnt, .z-checkbox-cnt, .z-slider-pp, input.button, input.file, .z-loading, .z-errbox {
+        font-family:Tahoma,Arial,Helvetica,sans-serif;
+        font-size:11px;
+        font-weight:normal;
+}
+
+.z-word-wrap {
+        word-wrap:normal;
+}
+
+.z-word-wrap .z-auxheader-cnt {
+        word-wrap:normal;
+}
+
+.z-window-embedded-tl, .z-window-modal-tl, .z-window-highlighted-tl, .z-window-overlapped-tl, .z-window-popup-tl {
+        background:none;
+        /*font-size:0;
+        height:5px;
+        line-height:0;
+        margin-right:5px; */
+}
+
+.z-window-embedded-tl {
+        background-image:none;
+}
+
+.z-window-popup-tl {
+        background-image:none;
+}
+
+.z-window-embedded-tr, .z-window-modal-tr, .z-window-highlighted-tr, .z-window-overlapped-tr, .z-window-popup-tr {
+        background:none;
+        /*font-size:0;
+        height:5px;
+        line-height:0;
+        margin-right:-5px;
+        position:relative; */
+}
+
+.z-window-embedded-tr {
+        background-image:none;
+}
+
+.z-window-popup-tr {
+        background-image:none;
+}
+
+.z-window-embedded-hl, .z-window-modal-hl, .z-window-highlighted-hl, .z-window-overlapped-hl, .z-window-popup-hl {
+        background:none;
+        /*padding-left:6px; */
+}
+
+.z-window-embedded-hl {
+        background-image:none;
+}
+
+.z-window-popup-hl {
+        background-image:none;
+}
+
+.z-window-embedded-hr, .z-window-modal-hr, .z-window-highlighted-hr, .z-window-overlapped-hr, .z-window-popup-hr {
+        background:none;
+        /*padding-right:6px; */
+}
+
+.z-window-embedded-hr, .z-window-embedded-hr-noborder {
+        background-image:none;
+}
+
+.z-window-modal-header, .z-window-popup-header, .z-window-highlighted-header, .z-window-overlapped-header, .z-window-embedded-header {
+        background-color:#FFFFFF;
+        color:#48AB48;
+        font-family:Tahoma,Arial,Helvetica,sans-serif;
+        font-size:20px;
+        padding-bottom:20px;
+        font-weight: normal;
+}
+
+.z-button {
+        font-family:Tahoma,Arial,Helvetica,sans-serif;
+        font-size:11px;
+        font-weight: bold;
+
+}
+
+.zk .z-window-embedded .z-button-cm, .z-button-cm {
+
+    background-color:#58A758;
+    background-image:none;
+    border:1px solid #006700;
+    color:#FFFFFF;
+    padding:2px 18px;
+}
+
+table.z-button {
+        table-layout:auto;
+}
+
+button.z-button {
+        position:relative;
+        top:-5px;
+}
+
+
+.z-tabs-scroll .z-tabs-cnt {
+        background:#FAFDFE none repeat scroll 0 0;
+        border-bottom:1px solid #7EAAC6;
+        padding-bottom:0;
+}
+
+.z-textbox, .z-decimalbox, .z-intbox, .z-longbox, .z-doublebox {
+        font-family:Tahoma,Arial,Helvetica,sans-serif;
+        font-size:11px;
+}
+
+div.z-footer-cnt, div.z-row-cnt, div.z-group-cnt, div.z-group-foot-cnt, div.z-column-cnt {
+        font-family:Tahoma,Arial,Helvetica,sans-serif;
+        font-size:11px;
+        font-weight:bold;
+}
+
+.z-word-wrap div.z-tree-cell-cnt, .z-word-wrap div.z-tree-footer-cnt, .z-word-wrap div.z-tree-col-cnt {
+        word-wrap:normal;
+}
+
+.z-tabs .z-tabs-cnt {
+        background:none;
+        border-bottom:0px;
+        border-bottom:1px solid #7EAAC6;
+}
+
+.z-tabs-scroll {
+        padding-bottom:0px;
+        background:#F2FBFF none repeat scroll 0 0;
+        border:0px solid #000000;
+}
+
+.z-tab .z-tab-text {
+        font-family:Tahoma,Arial,Helvetica,sans-serif;
+}
+
+.z-tab-seld .z-tab-text {
+        /* color:#0F3B82; */
+        font-family:Tahoma,Arial,Helvetica,sans-serif;
+}
+
+.z-tabpanel, .z-tabbox-ver .z-tabpanels-ver {
+        padding:5px;
+        border-bottom:1px solid #7EAAC6;
+}
+
+.message_INFO {
+        background-color:#CCEECC;
+        border:1px solid #006600;
+        color:#006600;
+        margin:10px;
+        padding:15px 15px 15px 50px;
+        width:300px;
+}
+
+div.z-grid {
+        background:#DAE7F6 none repeat scroll 0 0;
+        border:1px solid #ABC6DE;
+        overflow:hidden;
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index bb01df60a..3887a9dbe 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -2,16 +2,20 @@
 <window id="${arg.top_id}" title="${arg.title}">
     <tabbox>
         <tabs>
-            <tab label="${i18n:_('Edit')}"></tab>
+            <tab label="${i18n:_('General data')}"></tab>
             <tab label="${i18n:_('Order elements')}"></tab>
         </tabs>
         <tabpanels>
             <tabpanel>
-                <grid fixedLayout="false">
+                <grid fixedLayout="true">
+                    <columns>
+                        <column width="200px" />
+                        <column  />
+                    </columns>
                     <rows>
                         <row>
                             <label value="${i18n:_('Name')}" />
-                            <textbox value="@{controller.order.name}" />
+                            <textbox value="@{controller.order.name}" width="500px"/>
                         </row>
                         <row>
                             <label value="${i18n:_('Starting date')}" />
@@ -26,18 +30,18 @@
                         <row>
                             <label value="${i18n:_('Responsible')}" />
                             <textbox
-                                value="@{controller.order.responsible}" />
+                                value="@{controller.order.responsible}" width="500px"/>
                         </row>
                         <row>
                             <label value="${i18n:_('Customer')}" />
                             <textbox
-                                value="@{controller.order.customer}" />
+                                value="@{controller.order.customer}" width="500px"/>
                         </row>
                         <row>
                             <label value="${i18n:_('Description')}" />
                             <textbox
                                 value="@{controller.order.description}"
-                                rows="4" />
+                                rows="6" width="500px" />
                         </row>
                     </rows>
                 </grid>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul
index dbee45afa..5ac1780f2 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul
@@ -1,6 +1,6 @@
 <window id="${arg.top_id}" title="${i18n:_('Orders list')}">
     <grid id="listing" model="@{controller.orders}" mold="paging"
-        pageSize="5">
+        pageSize="5" fixedLayout="true">
         <columns>
             <column label="${i18n:_('Name')}" sort="auto(name)" />
             <column label="${i18n:_('Starting date')}" sort="auto(initDate)" />
@@ -19,14 +19,20 @@
                 <label value="@{order.customer}" />
                 <label value="@{order.description}" />
                 <hbox>
-                    <button label="${i18n:_('Edit')}"
+                    <button sclass="icono" image="/common/img/ico_editar1.png"
+                        hoverImage="/common/img/ico_editar.png"
+                        tooltiptext="${i18n:_('Edit')}"
                         onClick="controller.goToEditForm(self.parent.parent.value);">
                     </button>
 
-                    <button label="${i18n:_('Delete')}"
+                    <button sclass="icono" image="/common/img/ico_borrar1.png"
+                        hoverImage="/common/img/ico_borrar.png"
+                        tooltiptext="${i18n:_('Delete')}"
                         onClick="controller.confirmRemove(self.parent.parent.value);">
                     </button>
-                    <button label="${i18n:_('Schedule')}"
+                    <button sclass="icono" image="/common/img/ico_planificador1.png"
+                        hoverImage="/common/img/ico_planificador.png"
+                        tooltiptext="${i18n:_('Schedule')}"
                         onClick="controller.confirmSchedule(self.parent.parent.value);">
                     </button>
                 </hbox>
diff --git a/navalplanner-webapp/src/main/webapp/orders/orders.zul b/navalplanner-webapp/src/main/webapp/orders/orders.zul
index 2c459ac77..de70f9a91 100644
--- a/navalplanner-webapp/src/main/webapp/orders/orders.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/orders.zul
@@ -17,7 +17,7 @@
         <list top_id="listWindow" />
         <edition top_id="createWindow" title="${i18n:_('Create')}"
             save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
-        <edition top_id="editWindow" title="${i18n:_('Edit personal data')}"
+        <edition top_id="editWindow" title="${i18n:_('Edit order')}"
             save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
         <orderElement top_id="editOrderElement" title="${i18n:_('Edit order element')}"
             back_button_label="${i18n:_('Back')}" />
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
index 4488c4ac3..d5245ec81 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -20,12 +20,12 @@
                         <row>
                             <label value="${i18n:_('First name')}" />
                             <textbox
-                                value="@{controller.worker.firstName}" constraint="no empty"/>
+                                value="@{controller.worker.firstName}" constraint="no empty" width="500px"/>
                         </row>
                         <row>
                             <label value="${i18n:_('Last name')}" />
                             <textbox
-                                value="@{controller.worker.surname}" constraint="no empty" />
+                                value="@{controller.worker.surname}" constraint="no empty" width="500px"/>
                         </row>
                         <row>
                             <label value="${i18n:_('NIF')}" />
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index c40d2b913..fbd2c4e7b 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -15,8 +15,10 @@
                 <hbox>
                     <button sclass="icono" image="/common/img/ico_editar1.png"
                         hoverImage="/common/img/ico_editar.png"
+                        tooltiptext="${i18n:_('Edit')}"
                         onClick="controller.goToEditForm(self.getParent().getParent().value);">
                     </button>
+
                 </hbox>
             </row>
         </rows>
@@ -24,4 +26,4 @@
     <button id="show_create_form" onClick="controller.goToCreateForm();"
         label="${i18n:_('Create')}">
     </button>
-</window>
+</window>
\ No newline at end of file