diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index a3ea4a4c6..a51db97bf 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -18,10 +18,10 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${arg.title}" border="normal">
+<window id="${arg.top_id}" title="${arg.title}">
 
 
-<tabbox mold="accordion-lite">
+<tabbox>
     <tabs>
         <tab label="${i18n:_('Data')}" id="dataTab" />
         <tab label="${i18n:_('History')}"
@@ -115,17 +115,6 @@
             disabled="@{calendarController.editionController.isLastVersion}" />
     </hbox>
 
-    <hbox>
-        <button onClick="calendarController.editionController.save();"
-            label="${arg.save_button_label}"
-            visible="${arg.save_button_visible}" />
-        <button onClick="calendarController.editionController.cancel();"
-            label="${arg.cancel_button_label}" />
-        <button onClick="calendarController.editionController.createNewVersion();"
-            label="${i18n:_('Create new version')}"
-            visible="@{calendarController.editionController.isEditing}" />
-    </hbox>
-
 </vbox>
 
 </tabpanel>
@@ -149,4 +138,19 @@
 </tabpanels>
 </tabbox>
 
+    <hbox>
+        <button onClick="calendarController.editionController.save();"
+            label="${arg.save_button_label}"
+            sclass="save-button global-action"
+            visible="${arg.save_button_visible}" />
+        <button onClick="calendarController.editionController.cancel();"
+            label="${arg.cancel_button_label}"
+            sclass="cancel-button global-action" />
+        <button onClick="calendarController.editionController.createNewVersion();"
+            label="${i18n:_('Create new version')}"
+            visible="@{calendarController.editionController.isEditing}"
+            sclass="create-button global-action" />
+    </hbox>
+
+
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_list.zul b/navalplanner-webapp/src/main/webapp/calendars/_list.zul
index affae838c..fd509169f 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_list.zul
@@ -20,7 +20,8 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Calendars List')}">
     <tree id="tree" model="@{calendarController.baseCalendarsTreeModel}"
-        treeitemRenderer="@{calendarController.baseCalendarsTreeitemRenderer}">
+        treeitemRenderer="@{calendarController.baseCalendarsTreeitemRenderer}"
+        zclass="z-dottree">
         <treecols sizable="true">
             <treecol label="${i18n:_('Name')}" />
             <treecol label="${i18n:_('Operations')}" />
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 45820f76f..743ebf332 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -264,6 +264,12 @@ button.z-button {
         background-repeat: no-repeat;
 }
 
+/* Embed tabbpanels button destyling */
+.z-tabpanel .global-action.z-button .z-button-cm {
+    background-image: none;
+    padding: 2px 18px;
+    margin-left: 5px;
+}
 
 /* --- END -- Button styles --
 =================================================== */
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul
index 34844fa3a..371b20f31 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul
@@ -24,12 +24,19 @@
 
 <div visible="@{controller.isCalendarNull}">
 
-<hbox>
-    <label value="${i18n:_('Select parent calendar')}" />
-    <combobox id="createDerivedCalendar"
-        model="@{controller.baseCalendars}"
-        itemRenderer="@{controller.baseCalendarsComboitemRenderer}" />
-</hbox>
+    <grid fixedLayout="true">
+        <columns>
+            <column width="200px" />
+            <column />
+        </columns>
+        <rows>
+            <row>
+                <label value="${i18n:_('Select parent calendar')}" />
+                <combobox id="createDerivedCalendar" model="@{controller.baseCalendars}"
+                    itemRenderer="@{controller.baseCalendarsComboitemRenderer}" />
+            </row>
+        </rows>
+    </grid>
 
 </div>