diff --git a/modules/zone/front/basic-data/index.html b/modules/zone/front/basic-data/index.html
index f0122c4755..c5fef90217 100644
--- a/modules/zone/front/basic-data/index.html
+++ b/modules/zone/front/basic-data/index.html
@@ -93,17 +93,16 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            vn-acl="deliveryBoss"
+            label="Save">
+        </vn-submit>
         <vn-button
+            class="cancel"
             label="Undo changes"
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>
-    <vn-submit
-        icon="save"
-        vn-acl="deliveryBoss"
-        vn-tooltip="Save"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
 </form>
diff --git a/modules/zone/front/create/index.html b/modules/zone/front/create/index.html
index cda13362a5..f8c7df3919 100644
--- a/modules/zone/front/create/index.html
+++ b/modules/zone/front/create/index.html
@@ -84,10 +84,15 @@
             <vn-check ng-model="$ctrl.zone.isVolumetric" label="Volumetric"></vn-check>
         </vn-horizontal>
     </vn-card>
-    <vn-submit
-        icon="check"
-        vn-tooltip="Create"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
+    <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="zone.index">
+        </vn-button>
+    </vn-button-bar>
 </form>