diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index 02bcea9fa..8e011a9b3 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -323,8 +323,6 @@ public class Planner extends HtmlMacroComponent  {
         this.ganttPanel = new GanttPanel(this.context,
                 commandsOnTasksContextualized, doubleClickCommand,
                 disabilityConfiguration);
-        Button button = (Button) getFellow("btnPrint");
-        button.setDisabled(!context.isPrintEnabled());
     }
 
     @SuppressWarnings("unchecked")
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index d133530e8..e7780c4a3 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -7,12 +7,28 @@ planner = self;
     <borderlayout sclass="plannerlayout" width="auto">
        <north height="30px" border="0">
        <hbox align="center" id="toolbar" sclass="toolbar-box">
+        <!--  Commands -->
+        <button id="btnPrint" onClick="planner.print()"
+            image="/common/img/ico_print.png"
+            tooltiptext="${i18n:_('Print')}" />
         <separator/>
+        <!--  Visualization modes -->
         <label>${i18n:_('Zoom level')}:</label>
         <listbox mold="select" rows="1"
             model="${planner.zoomLevels}"
             onSelect="planner.setZoomLevel(self.selectedItem.value);" >
         </listbox>
+
+        <button id="showCriticalPath" onClick="planner.showCriticalPath();"
+            image="/common/img/ico_criticalpath.png"
+            tooltiptext="${i18n:_('Show/Hide Critical path')}" />
+        <button id="showAllLabels" onClick="planner.showAllLabels();"
+            image="/common/img/ico_labels.png"
+            tooltiptext="${i18n:_('Show/Hide all labels')}" sclass="planner-command show-labels" />
+        <button id="showAllResources" onClick="planner.showAllResources();"
+            image="/common/img/ico_resources.png"
+            tooltiptext="${i18n:_('Show all resources')}" sclass="planner-command show-resources" />
+        <!--  Filtering -->
         <separator/>
         <label>${i18n:_('Filter')}:</label>
         <combobox>
@@ -29,17 +45,6 @@ planner = self;
         </combobox>
         <textbox/>
         <separator />
-        <button id="showCriticalPath" onClick="planner.showCriticalPath();"
-            label="${i18n:_('Critical path')}" />
-
-        <button id="showAllLabels" onClick="planner.showAllLabels();"
-            label="${i18n:_('Show all labels')}" sclass="planner-command show-labels" />
-
-        <button id="showAllResources" onClick="planner.showAllResources();"
-            label="${i18n:_('Show all resources')}" sclass="planner-command show-resources" />
-
-        <button id="btnPrint" onClick="planner.print()"
-            label="${i18n:_('Print')}" />
 
        </hbox>
        </north>
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_criticalpath.png b/navalplanner-webapp/src/main/webapp/common/img/ico_criticalpath.png
new file mode 100644
index 000000000..6a9ccd591
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_criticalpath.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_expand.png b/navalplanner-webapp/src/main/webapp/common/img/ico_expand.png
new file mode 100644
index 000000000..2900c7c23
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_expand.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_labels.png b/navalplanner-webapp/src/main/webapp/common/img/ico_labels.png
new file mode 100644
index 000000000..84a8aa3e2
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_labels.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_print.png b/navalplanner-webapp/src/main/webapp/common/img/ico_print.png
new file mode 100644
index 000000000..2505337ee
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_print.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_refresh.png b/navalplanner-webapp/src/main/webapp/common/img/ico_refresh.png
new file mode 100644
index 000000000..3ae6f9fac
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_refresh.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_resources.png b/navalplanner-webapp/src/main/webapp/common/img/ico_resources.png
new file mode 100644
index 000000000..eb39824e6
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_resources.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_save.png b/navalplanner-webapp/src/main/webapp/common/img/ico_save.png
new file mode 100644
index 000000000..0227f4432
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_save.png differ