diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul b/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
index 5836f4f8d..5797c4842 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
@@ -69,10 +69,10 @@
     </tabbox>
 
     <button onClick="controller.saveAndExit();"
-        label="${i18n:_('Save')}" />
+        label="${i18n:_('Save')}" sclass="save-button global-action" />
     <button onClick="controller.saveAndContinue();"
-        label="${i18n:_('Save &amp; Continue')}" />
+        label="${i18n:_('Save &amp; Continue')}" sclass="saveandcontinue-button global-action" />
     <button onClick="controller.cancel();"
-        label="${i18n:_('Cancel')}" />
+        label="${i18n:_('Cancel')}" sclass="cancel-button global-action" />
 
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
index 7b3d30d06..411f1dfd0 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
@@ -66,10 +66,10 @@
     </tabbox>
 
     <button onClick="controller.saveAndExit();"
-        label="${i18n:_('Save')}" />
+        label="${i18n:_('Save')}" sclass="save-button global-action" />
     <button onClick="controller.saveAndContinue();"
-        label="${i18n:_('Save &amp; Continue')}" />
+        label="${i18n:_('Save &amp; Continue')}" sclass="saveandcontinue-button global-action" />
     <button onClick="controller.cancel();"
-        label="${i18n:_('Cancel')}" />
+        label="${i18n:_('Cancel')}" sclass="cancel-button global-action" />
 
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
index b2d6380db..e055989b5 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
@@ -40,6 +40,6 @@
         </rows>
     </newdatasortablegrid>
     <button id="show_create_form" onClick="controller.goToCreateForm();"
-        label="${i18n:_('Create')}">
+        label="${i18n:_('Create')}" sclass="create-button global-action">
     </button>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
index 8a8dba5a9..a40e5b109 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
@@ -46,6 +46,6 @@
         </rows>
     </newdatasortablegrid>
     <button id="show_create_form" onClick="controller.goToCreateForm();"
-        label="${i18n:_('Create')}">
+        label="${i18n:_('Create')}" sclass="create-button global-action" >
     </button>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 22089aed9..60c87ab98 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -91,8 +91,8 @@
         <button label="${i18n:_('Save &amp; Continue')}"
             onClick="controller.saveAndContinue()"
             sclass="saveandcontinue-button global-action"/>
-        <button label="${i18n:_('Close')}"
+        <button label="${i18n:_('Cancel')}"
             onClick="controller.close()"
-            sclass="close-button global-action"/>
+            sclass="cancel-button global-action"/>
     </hbox>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul
index 7949713c9..2c48da932 100644
--- a/navalplanner-webapp/src/main/webapp/materials/materials.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul
@@ -117,7 +117,8 @@
 
         <!-- Save button -->
         <button onClick="materialsController.saveAndContinue()"
-            label="${i18n:_('Save')}" />
+            label="${i18n:_('Save')}"
+            sclass="save-button global-action"/>
 
     </window>