diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 2909fe2c7..a5770bb33 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -56,17 +56,17 @@
                         </grid>
                     </panelchildren>
                 </panel>
-
-                <!-- Control buttons -->
-                <hbox>
-                    <button label="${i18n:_('Save')}"
-                        onClick="controller.save()" />
-                    <button label="${i18n:_('Save &amp; Continue')}"
-                        onClick="controller.saveAndContinue()" />
-                    <button label="${i18n:_('Close')}"
-                        onClick="controller.close()" />
-                </hbox>
             </tabpanel>
         </tabpanels>
     </tabbox>
+
+    <!-- Control buttons -->
+    <hbox>
+        <button label="${i18n:_('Save')}"
+            onClick="controller.save()" />
+        <button label="${i18n:_('Save &amp; Continue')}"
+            onClick="controller.saveAndContinue()" />
+        <button label="${i18n:_('Close')}"
+            onClick="controller.close()" />
+    </hbox>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
index 7c574c9a5..323cec9c8 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
@@ -1,6 +1,6 @@
 <window id="${arg.id}" title="${i18n:_('List label types')}">
     <grid id="labelTypes" model="@{controller.labelTypes}"
-        mold="paging" pageSize="10">
+        mold="paging" pageSize="10" fixedLayout="true">
         <columns>
             <column label="${i18n:_('Name')}" sort="auto(name)" sortDirection="ascending" />
             <column label="${i18n:_('Operations')}" />
@@ -9,10 +9,15 @@
             <row self="@{each='labelType'}" value="@{labelType}">
                 <label value="@{labelType.name}" />
                 <hbox>
-                    <button label="${i18n:_('Edit')}"
-                        onClick="controller.goToEditForm(self.parent.parent.value)"/>
-                    <button label="${i18n:_('Delete')}"
-                        onClick="controller.confirmDelete(self.parent.parent.value)"/>
+                    <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 sclass="icono" image="/common/img/ico_borrar1.png"
+                        hoverImage="/common/img/ico_borrar.png"
+                        tooltiptext="${i18n:_('Delete')}"
+                        onClick="controller.confirmDelete(self.parent.parent.value);"/>
                 </hbox>
             </row>
         </rows>