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 12b6b96c3..d1defa2fb 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -189,3 +189,10 @@ table {
     color:#007bbe;
     font-weight:bold;
 }
+
+.icono .zk .z-button-cm, .icono .z-button-cm {
+    color: #007bbe;
+    background-color: transparent;
+    background-image: none;
+    border: 0px solid #007bbe;
+}
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_bajar.png b/navalplanner-webapp/src/main/webapp/common/img/ico_bajar.png
new file mode 100644
index 000000000..1fd766cb1
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_bajar.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_bajar1.png b/navalplanner-webapp/src/main/webapp/common/img/ico_bajar1.png
new file mode 100644
index 000000000..85aed71db
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_bajar1.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_bajar_out.png b/navalplanner-webapp/src/main/webapp/common/img/ico_bajar_out.png
new file mode 100644
index 000000000..1eb6b87c8
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_bajar_out.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_borrar.png b/navalplanner-webapp/src/main/webapp/common/img/ico_borrar.png
new file mode 100644
index 000000000..f2f19d5fd
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_borrar.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_borrar1.png b/navalplanner-webapp/src/main/webapp/common/img/ico_borrar1.png
new file mode 100644
index 000000000..ab409aaa2
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_borrar1.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_borrar_out.png b/navalplanner-webapp/src/main/webapp/common/img/ico_borrar_out.png
new file mode 100644
index 000000000..1c11bd00c
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_borrar_out.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_derecha.png b/navalplanner-webapp/src/main/webapp/common/img/ico_derecha.png
new file mode 100644
index 000000000..e75e4f0e8
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_derecha.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_derecha1.png b/navalplanner-webapp/src/main/webapp/common/img/ico_derecha1.png
new file mode 100644
index 000000000..320f01347
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_derecha1.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_derecha_out.png b/navalplanner-webapp/src/main/webapp/common/img/ico_derecha_out.png
new file mode 100644
index 000000000..4fceac0ed
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_derecha_out.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_editar.png b/navalplanner-webapp/src/main/webapp/common/img/ico_editar.png
new file mode 100644
index 000000000..a6c1539fe
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_editar.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_editar1.png b/navalplanner-webapp/src/main/webapp/common/img/ico_editar1.png
new file mode 100644
index 000000000..0765cc08c
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_editar1.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_editar_out.png b/navalplanner-webapp/src/main/webapp/common/img/ico_editar_out.png
new file mode 100644
index 000000000..d1417a31f
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_editar_out.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_izq.png b/navalplanner-webapp/src/main/webapp/common/img/ico_izq.png
new file mode 100644
index 000000000..533e237ff
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_izq.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_izq1.png b/navalplanner-webapp/src/main/webapp/common/img/ico_izq1.png
new file mode 100644
index 000000000..86032380e
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_izq1.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_izq_out.png b/navalplanner-webapp/src/main/webapp/common/img/ico_izq_out.png
new file mode 100644
index 000000000..065dbf135
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_izq_out.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_ok.png b/navalplanner-webapp/src/main/webapp/common/img/ico_ok.png
new file mode 100644
index 000000000..6362ac952
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_ok.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_planificador.png b/navalplanner-webapp/src/main/webapp/common/img/ico_planificador.png
new file mode 100644
index 000000000..61c5c41c5
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_planificador.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_planificador1.png b/navalplanner-webapp/src/main/webapp/common/img/ico_planificador1.png
new file mode 100644
index 000000000..677d66023
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_planificador1.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_planificador_out.png b/navalplanner-webapp/src/main/webapp/common/img/ico_planificador_out.png
new file mode 100644
index 000000000..e53a39539
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_planificador_out.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_subir.png b/navalplanner-webapp/src/main/webapp/common/img/ico_subir.png
new file mode 100644
index 000000000..f211020dc
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_subir.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_subir1.png b/navalplanner-webapp/src/main/webapp/common/img/ico_subir1.png
new file mode 100644
index 000000000..ebb003cce
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_subir1.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_subir_out.png b/navalplanner-webapp/src/main/webapp/common/img/ico_subir_out.png
new file mode 100644
index 000000000..76e418e38
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_subir_out.png differ
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
index 7485ac8e3..4488c4ac3 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -11,7 +11,7 @@
         </tabs>
         <tabpanels>
             <tabpanel>
-                <grid fixedLayout="false">
+                <grid fixedLayout="true">
                     <columns>
                         <column width="200px" />
                         <column  />
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index c070121d1..c40d2b913 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -1,6 +1,6 @@
 <window id="${arg.top_id}" title="${i18n:_('Workers list')}">
     <grid id="listing" model="@{controller.workers}" mold="paging"
-        pageSize="5">
+        pageSize="5" fixedLayout="true">
         <columns>
             <column label="${i18n:_('First name')}" sort="auto(firstName)" />
             <column label="${i18n:_('Surname')}" sort="auto(surname)" />
@@ -13,7 +13,8 @@
                 <label value="@{worker.surname}" />
                 <label value="@{worker.nif}" />
                 <hbox>
-                    <button label="${i18n:_('Edit')}"
+                    <button sclass="icono" image="/common/img/ico_editar1.png"
+                        hoverImage="/common/img/ico_editar.png"
                         onClick="controller.goToEditForm(self.getParent().getParent().value);">
                     </button>
                 </hbox>