diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index bc013c5f1e..c23a8cc4d4 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -827,7 +827,7 @@ export default {
         firstTravelReference: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr > vn-td-editable',
         removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i'
     },
-    travelBasicDada: {
+    travelBasicData: {
         reference: 'vn-travel-basic-data vn-textfield[ng-model="$ctrl.travel.ref"]',
         agency: 'vn-travel-basic-data vn-autocomplete[ng-model="$ctrl.travel.agencyModeFk"]',
         deliveryDate: 'vn-travel-basic-data vn-date-picker[ng-model="$ctrl.travel.landed"]',
diff --git a/e2e/paths/02-client/01_create_client.spec.js b/e2e/paths/02-client/01_create_client.spec.js
index 9029910a7a..4cb3c67abd 100644
--- a/e2e/paths/02-client/01_create_client.spec.js
+++ b/e2e/paths/02-client/01_create_client.spec.js
@@ -27,13 +27,6 @@ describe('Client create path', () => {
         await page.waitForState('client.create');
     });
 
-    it('should receive an error when clicking the create button having all the form fields empty', async() => {
-        await page.waitToClick(selectors.createClientView.createButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Some fields are invalid');
-    });
-
     it('should receive an error when clicking the create button having name and Business name fields empty', async() => {
         await page.write(selectors.createClientView.taxNumber, '74451390E');
         await page.write(selectors.createClientView.userName, 'CaptainMarvel');
diff --git a/e2e/paths/02-client/20_credit_insurance.spec.js b/e2e/paths/02-client/20_credit_insurance.spec.js
index 904a51145e..58cb2737cf 100644
--- a/e2e/paths/02-client/20_credit_insurance.spec.js
+++ b/e2e/paths/02-client/20_credit_insurance.spec.js
@@ -20,6 +20,7 @@ describe('Client credit insurance path', () => {
     });
 
     it('should open the create a new credit contract form', async() => {
+        await page.waitForTimeout(1000);
         await page.waitToClick(selectors.clientCreditInsurance.addNewContract);
         await page.waitForState('client.card.creditInsurance.create');
     });
diff --git a/e2e/paths/04-item/03_tax.spec.js b/e2e/paths/04-item/03_tax.spec.js
index 0f127bdd58..8b3b0f8b11 100644
--- a/e2e/paths/04-item/03_tax.spec.js
+++ b/e2e/paths/04-item/03_tax.spec.js
@@ -54,7 +54,8 @@ describe('Item edit tax path', () => {
         expect(firstVatType).toEqual('Reduced VAT');
     });
 
-    it(`should now click the undo changes button and see the changes works`, async() => {
+    // # #2680 Undo changes button bugs
+    xit(`should now click the undo changes button and see the form is restored`, async() => {
         await page.waitToClick(selectors.itemTax.undoChangesButton);
         const firstVatType = await page.waitToGetProperty(selectors.itemTax.firstClass, 'value');
 
diff --git a/e2e/paths/05-ticket/05_tracking_state.spec.js b/e2e/paths/05-ticket/05_tracking_state.spec.js
index 9c8e6d4922..07f0d86bcc 100644
--- a/e2e/paths/05-ticket/05_tracking_state.spec.js
+++ b/e2e/paths/05-ticket/05_tracking_state.spec.js
@@ -24,13 +24,6 @@ describe('Ticket Create new tracking state path', () => {
             await page.waitForState('ticket.card.tracking.edit');
         });
 
-        it(`should attempt create a new state but receive an error if state is empty`, async() => {
-            await page.waitToClick(selectors.createStateView.saveStateButton);
-            const message = await page.waitForSnackbar();
-
-            expect(message.text).toContain('State cannot be blank');
-        });
-
         it(`should create a new state`, async() => {
             await page.autocompleteSearch(selectors.createStateView.state, '¿Fecha?');
             await page.waitToClick(selectors.createStateView.saveStateButton);
diff --git a/e2e/paths/10-travel/02_basic_data_and_log.spec.js b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
index 9c81e6f638..50e2e1980a 100644
--- a/e2e/paths/10-travel/02_basic_data_and_log.spec.js
+++ b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
@@ -25,31 +25,32 @@ describe('Travel basic data path', () => {
         const lastMonth = new Date();
         lastMonth.setMonth(lastMonth.getMonth() - 1);
 
-        await page.pickDate(selectors.travelBasicDada.deliveryDate, lastMonth);
-        await page.waitToClick(selectors.travelBasicDada.save);
+        await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);
+        await page.waitToClick(selectors.travelBasicData.save);
         const message = await page.waitForSnackbar();
 
         expect(message.text).toContain('Landing cannot be lesser than shipment');
     });
 
     it('should undo the changes', async() => {
-        await page.waitToClick(selectors.travelBasicDada.undoChanges);
-        await page.waitToClick(selectors.travelBasicDada.save);
-        const message = await page.waitForSnackbar();
+        await page.clearInput(selectors.travelBasicData.reference);
+        await page.write(selectors.travelBasicData.reference, 'totally pointless ref');
+        await page.waitToClick(selectors.travelBasicData.undoChanges);
+        const result = await page.waitToGetProperty(selectors.travelBasicData.reference, 'value');
 
-        expect(message.text).toContain('No changes to save');
+        expect(result).toEqual('third travel');
     });
 
     it('should now edit the whole form then save', async() => {
-        await page.clearInput(selectors.travelBasicDada.reference);
-        await page.write(selectors.travelBasicDada.reference, 'new reference!');
+        await page.clearInput(selectors.travelBasicData.reference);
+        await page.write(selectors.travelBasicData.reference, 'new reference!');
         await page.waitForTimeout(2000);
-        await page.autocompleteSearch(selectors.travelBasicDada.agency, 'Entanglement');
-        await page.autocompleteSearch(selectors.travelBasicDada.outputWarehouse, 'Warehouse Three');
-        await page.autocompleteSearch(selectors.travelBasicDada.inputWarehouse, 'Warehouse Four');
-        await page.waitToClick(selectors.travelBasicDada.delivered);
-        await page.waitToClick(selectors.travelBasicDada.received);
-        await page.waitToClick(selectors.travelBasicDada.save);
+        await page.autocompleteSearch(selectors.travelBasicData.agency, 'Entanglement');
+        await page.autocompleteSearch(selectors.travelBasicData.outputWarehouse, 'Warehouse Three');
+        await page.autocompleteSearch(selectors.travelBasicData.inputWarehouse, 'Warehouse Four');
+        await page.waitToClick(selectors.travelBasicData.delivered);
+        await page.waitToClick(selectors.travelBasicData.received);
+        await page.waitToClick(selectors.travelBasicData.save);
         const message = await page.waitForSnackbar();
 
         expect(message.text).toContain('Data saved!');
@@ -57,35 +58,35 @@ describe('Travel basic data path', () => {
 
     it('should reload the section and check the reference was saved', async() => {
         await page.reloadSection('travel.card.basicData');
-        const result = await page.waitToGetProperty(selectors.travelBasicDada.reference, 'value');
+        const result = await page.waitToGetProperty(selectors.travelBasicData.reference, 'value');
 
         expect(result).toEqual('new reference!');
     });
 
     it('should check the agency was saved', async() => {
-        const result = await page.waitToGetProperty(selectors.travelBasicDada.agency, 'value');
+        const result = await page.waitToGetProperty(selectors.travelBasicData.agency, 'value');
 
         expect(result).toEqual('Entanglement');
     });
 
     it('should check the output warehouse date was saved', async() => {
-        const result = await page.waitToGetProperty(selectors.travelBasicDada.outputWarehouse, 'value');
+        const result = await page.waitToGetProperty(selectors.travelBasicData.outputWarehouse, 'value');
 
         expect(result).toEqual('Warehouse Three');
     });
 
     it('should check the input warehouse date was saved', async() => {
-        const result = await page.waitToGetProperty(selectors.travelBasicDada.inputWarehouse, 'value');
+        const result = await page.waitToGetProperty(selectors.travelBasicData.inputWarehouse, 'value');
 
         expect(result).toEqual('Warehouse Four');
     });
 
     it(`should check the delivered checkbox was saved even tho it doesn't make sense`, async() => {
-        await page.waitForClassPresent(selectors.travelBasicDada.delivered, 'checked');
+        await page.waitForClassPresent(selectors.travelBasicData.delivered, 'checked');
     });
 
     it(`should check the received checkbox was saved even tho it doesn't make sense`, async() => {
-        await page.waitForClassPresent(selectors.travelBasicDada.received, 'checked');
+        await page.waitForClassPresent(selectors.travelBasicData.received, 'checked');
     });
 
     it('should navigate to the travel logs', async() => {
diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss
index 67c9b404f1..a3fc386e20 100644
--- a/front/core/components/button/style.scss
+++ b/front/core/components/button/style.scss
@@ -76,6 +76,13 @@
     &:hover,
     &:focus {
         outline: none;
+
+        &.cancel {
+            &:hover,
+            &:focus {
+                background-color: transparent;
+            }
+        }
     }
     &.round {
         border-radius: 50%;
@@ -106,4 +113,14 @@
         opacity: .7;
         cursor: initial;
     }
+    &.cancel {
+        color: $color-button;
+        background-color: transparent;
+        box-shadow: none;
+        &:not(.disabled) {
+            &:hover {
+                color: lighten($color-button, 10%);
+            }
+        }
+    }
 }
diff --git a/front/core/components/confirm/confirm.html b/front/core/components/confirm/confirm.html
index 8ae66ccb29..3debb1cfef 100644
--- a/front/core/components/confirm/confirm.html
+++ b/front/core/components/confirm/confirm.html
@@ -2,6 +2,6 @@
     {{::$ctrl.question}}
 </tpl-body>
 <tpl-buttons>
-    <button response="cancel" translate>Cancel</button>
-    <button response="accept" translate vn-focus>Accept</button>
+    <input type="button" response="cancel" translate-attr="{value: 'Cancel'}">
+    <button response="accept" translate>Accept</button>
 </tpl-buttons>
\ No newline at end of file
diff --git a/front/core/components/dialog/style.scss b/front/core/components/dialog/style.scss
index 47837af7e6..998c475e06 100644
--- a/front/core/components/dialog/style.scss
+++ b/front/core/components/dialog/style.scss
@@ -34,7 +34,6 @@
             input[type="button"],
             input[type="submit"],
             input[type="reset"] {
-                @extend %clickable;
                 text-transform: uppercase;
                 background-color: transparent;
                 border: none;
@@ -44,6 +43,20 @@
                 padding: 11px;
                 margin: -11px;
                 margin-left: 11px;
+
+                &:hover,
+                &:focus {
+                    color: lighten($color-button, 10%);
+                }
+            }
+            button {
+                background-color: $color-button;
+                color: white;
+                &:hover,
+                &:focus {
+                    background-color: lighten($color-button, 10%);
+                    color: white;
+                }
             }
         }
     }
diff --git a/modules/account/front/accounts/index.html b/modules/account/front/accounts/index.html
index 692624fa5c..195607fd15 100644
--- a/modules/account/front/accounts/index.html
+++ b/modules/account/front/accounts/index.html
@@ -53,33 +53,32 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
         <vn-button
-            label="Undo changes"
-            ng-if="watcher.dataChanged()"
-            ng-click="watcher.loadOriginalData()">
-        </vn-button>
-        <vn-button
-            ng-if="!watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Synchronize all"
             ng-click="$ctrl.onSynchronizeAll()">
         </vn-button>
         <vn-button
-            ng-if="!watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Synchronize user"
             ng-click="syncUser.show()">
         </vn-button>
         <vn-button
-            ng-if="!watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Synchronize roles"
             ng-click="$ctrl.onSynchronizeRoles()">
         </vn-button>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
-    <vn-submit
-        icon="save"
-        vn-tooltip="Save"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
 </form>
 <vn-dialog
     vn-id="syncUser"
diff --git a/modules/account/front/acl/create/index.html b/modules/account/front/acl/create/index.html
index 96fe5abad2..7f4fa9e462 100644
--- a/modules/account/front/acl/create/index.html
+++ b/modules/account/front/acl/create/index.html
@@ -56,10 +56,15 @@
             </vn-autocomplete>
         </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="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="account.acl">
+        </vn-button>
+    </vn-button-bar>
 </form>
diff --git a/modules/account/front/alias/basic-data/index.html b/modules/account/front/alias/basic-data/index.html
index ede77f9292..523c9297a1 100644
--- a/modules/account/front/alias/basic-data/index.html
+++ b/modules/account/front/alias/basic-data/index.html
@@ -29,16 +29,15 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            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-tooltip="Save"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
 </form>
\ No newline at end of file
diff --git a/modules/account/front/alias/create/index.html b/modules/account/front/alias/create/index.html
index dee59d26ea..4dad1b8705 100644
--- a/modules/account/front/alias/create/index.html
+++ b/modules/account/front/alias/create/index.html
@@ -24,10 +24,15 @@
             </vn-textfield>
         </vn-vertical>
     </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="account.alias">
+        </vn-button>
+    </vn-button-bar>
 </form>
diff --git a/modules/account/front/basic-data/index.html b/modules/account/front/basic-data/index.html
index d21dda45ad..91df3bffd9 100644
--- a/modules/account/front/basic-data/index.html
+++ b/modules/account/front/basic-data/index.html
@@ -37,16 +37,15 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            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-tooltip="Save"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
 </form>
diff --git a/modules/account/front/create/index.html b/modules/account/front/create/index.html
index 407ac0e3c4..ca4a2f8407 100644
--- a/modules/account/front/create/index.html
+++ b/modules/account/front/create/index.html
@@ -44,10 +44,14 @@
             </vn-check>
         </vn-vertical>
     </vn-card>
-    <vn-submit
-        icon="check"
-        vn-tooltip="Create"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
+    <vn-button-bar>
+        <vn-submit
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="account.index">
+        </vn-button>
+    </vn-button-bar>
 </form>
diff --git a/modules/account/front/ldap/index.html b/modules/account/front/ldap/index.html
index 79dc967ff8..5c5aaead48 100644
--- a/modules/account/front/ldap/index.html
+++ b/modules/account/front/ldap/index.html
@@ -48,21 +48,20 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
         <vn-button
             disabled="watcher.dataChanged()"
             label="Test connection"
             ng-click="$ctrl.onTestConection()">
         </vn-button>
         <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-tooltip="Save"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
 </form>
diff --git a/modules/account/front/mail-forwarding/index.html b/modules/account/front/mail-forwarding/index.html
index a6be2782ae..6c688f504a 100644
--- a/modules/account/front/mail-forwarding/index.html
+++ b/modules/account/front/mail-forwarding/index.html
@@ -27,12 +27,18 @@
                 </vn-textfield>
             </vn-vertical>
         </vn-card>
-        <vn-submit
-            icon="save"
-            vn-tooltip="Save"
-            class="round"
-            fixed-bottom-right>
-        </vn-submit>
+        <vn-button-bar>
+            <vn-submit
+                disabled="!watcher.dataChanged()"
+                label="Save">
+            </vn-submit>
+            <vn-button
+                class="cancel"
+                label="Undo changes"
+                disabled="!watcher.dataChanged()"
+                ng-click="watcher.loadOriginalData()">
+            </vn-button>
+        </vn-button-bar>
     </form>
 </div>
 <div
diff --git a/modules/account/front/role/basic-data/index.html b/modules/account/front/role/basic-data/index.html
index e79601dccc..7499271864 100644
--- a/modules/account/front/role/basic-data/index.html
+++ b/modules/account/front/role/basic-data/index.html
@@ -24,16 +24,15 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            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-tooltip="Save"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
 </form>
\ No newline at end of file
diff --git a/modules/account/front/role/create/index.html b/modules/account/front/role/create/index.html
index f610f6d233..02900d5808 100644
--- a/modules/account/front/role/create/index.html
+++ b/modules/account/front/role/create/index.html
@@ -24,10 +24,15 @@
             </vn-textfield>
         </vn-vertical>
     </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="account.role">
+        </vn-button>
+    </vn-button-bar>
 </form>
diff --git a/modules/account/front/samba/index.html b/modules/account/front/samba/index.html
index 92e0a86242..4379f10a28 100644
--- a/modules/account/front/samba/index.html
+++ b/modules/account/front/samba/index.html
@@ -47,21 +47,20 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
         <vn-button
             disabled="watcher.dataChanged()"
             label="Test connection"
             ng-click="$ctrl.onTestConection()">
         </vn-button>
         <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-tooltip="Save"
-        class="round"
-        fixed-bottom-right>
-    </vn-submit>
-</form>
+</form>
\ No newline at end of file
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index d2338bcc33..eb3c3b9e32 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -62,9 +62,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" 
-            ng-if="$ctrl.$.form.$dirty" 
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>
diff --git a/modules/claim/front/development/index.html b/modules/claim/front/development/index.html
index 3a78e6374d..f274104b08 100644
--- a/modules/claim/front/development/index.html
+++ b/modules/claim/front/development/index.html
@@ -105,9 +105,17 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
-        <vn-submit 
-            label="Save" 
-            ng-click="$ctrl.onSubmit()">
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            ng-click="$ctrl.onSubmit()"
+            label="Save">
         </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </vn-vertical>
\ No newline at end of file
diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html
index 07b24db899..6235ec9238 100644
--- a/modules/client/front/basic-data/index.html
+++ b/modules/client/front/basic-data/index.html
@@ -71,7 +71,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html
index 0e61f4d16d..b9c20ec24c 100644
--- a/modules/client/front/billing-data/index.html
+++ b/modules/client/front/billing-data/index.html
@@ -95,8 +95,16 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save" vn-acl="salesAssistant"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 
diff --git a/modules/client/front/contact/index.html b/modules/client/front/contact/index.html
index 664a59567e..eab1f33ce5 100644
--- a/modules/client/front/contact/index.html
+++ b/modules/client/front/contact/index.html
@@ -46,6 +46,16 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/client/front/create/index.html b/modules/client/front/create/index.html
index ce2ddc38be..d9759e3478 100644
--- a/modules/client/front/create/index.html
+++ b/modules/client/front/create/index.html
@@ -125,8 +125,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Create"></vn-submit>
-        <vn-button ui-sref="client.index" label="Cancel"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="client.index">
+        </vn-button>
     </vn-button-bar>
 </form>
 <!-- New postcode dialog -->
diff --git a/modules/client/front/credit-insurance/create/index.html b/modules/client/front/credit-insurance/create/index.html
index d1dc081b76..c32d0a87b5 100644
--- a/modules/client/front/credit-insurance/create/index.html
+++ b/modules/client/front/credit-insurance/create/index.html
@@ -25,7 +25,13 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ui-sref="client.card.creditInsurance.index" label="Cancel"></vn-button>
+        <vn-submit
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="client.card.creditInsurance.index"></vn-button>
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/client/front/credit/create/index.html b/modules/client/front/credit/create/index.html
index e3160a2ae9..13ba434d07 100644
--- a/modules/client/front/credit/create/index.html
+++ b/modules/client/front/credit/create/index.html
@@ -19,8 +19,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.cancel()" label="Cancel"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button 
+            ng-click="$ctrl.cancel()"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-confirm
diff --git a/modules/client/front/dms/create/index.html b/modules/client/front/dms/create/index.html
index e585dc398a..8f270378f0 100644
--- a/modules/client/front/dms/create/index.html
+++ b/modules/client/front/dms/create/index.html
@@ -94,8 +94,15 @@
             </vn-vertical>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Upload"></vn-submit>
-            <vn-button ui-sref="client.card.dms.index" label="Cancel"></vn-button>
+            <vn-submit
+                disabled="!watcher.dataChanged()"
+                label="Upload">
+            </vn-submit>
+            <vn-button
+                class="cancel"
+                label="Cancel"
+                ui-sref="client.card.dms.index">
+            </vn-button>
         </vn-button-bar>
     </div>
 </form>
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index 0523f9fb66..2b671c69a4 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -202,8 +202,16 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="$ctrl.$.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-confirm 
diff --git a/modules/client/front/greuge/create/index.html b/modules/client/front/greuge/create/index.html
index dc53f9e2bc..7cbacb3496 100644
--- a/modules/client/front/greuge/create/index.html
+++ b/modules/client/front/greuge/create/index.html
@@ -40,7 +40,13 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.goToIndex()" label="Cancel"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            ng-click="$ctrl.goToIndex()"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/client/front/note/create/index.html b/modules/client/front/note/create/index.html
index aba03aafbb..ca61c74b37 100644
--- a/modules/client/front/note/create/index.html
+++ b/modules/client/front/note/create/index.html
@@ -17,8 +17,14 @@
             </vn-textarea>
         </vn-horizontal>
     </vn-card>
-    <vn-button-bar> 
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.cancel()" label="Cancel"></vn-button>
+    <vn-button-bar>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            ng-click="$ctrl.cancel()"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/client/front/recovery/create/index.html b/modules/client/front/recovery/create/index.html
index 7747bb4d75..3d4cc2e1ed 100644
--- a/modules/client/front/recovery/create/index.html
+++ b/modules/client/front/recovery/create/index.html
@@ -32,7 +32,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.cancel()" label="Cancel"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ng-click="$ctrl.cancel()">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/client/front/sample/create/index.html b/modules/client/front/sample/create/index.html
index d8bd4712ab..f941e885ad 100644
--- a/modules/client/front/sample/create/index.html
+++ b/modules/client/front/sample/create/index.html
@@ -53,12 +53,20 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Send"></vn-submit>
-        <vn-button ng-if="sampleType.selection.hasPreview"
+        <vn-submit
+            disabled="!sampleType.selection"
+            label="Send">
+        </vn-submit>
+        <vn-button
+            disabled="!sampleType.selection.hasPreview"
             label="Preview" 
             ng-click="$ctrl.showPreview()">
         </vn-button>
-        <vn-button ui-sref="client.card.sample.index" label="Cancel"></vn-button>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="client.card.sample.index">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-dialog
diff --git a/modules/client/front/web-access/index.html b/modules/client/front/web-access/index.html
index f7488dbdfa..07a2615dd6 100644
--- a/modules/client/front/web-access/index.html
+++ b/modules/client/front/web-access/index.html
@@ -26,9 +26,21 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-if="$ctrl.canChangePassword" label="Change password" vn-dialog="change-pass"></vn-button>
-        <vn-button label="Undo changes" ng-if="$ctrl.$.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+        ng-if="$ctrl.canChangePassword"
+        label="Change password"
+        vn-dialog="change-pass">
+        </vn-button>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-dialog
diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
index 475afdfd4e..4b7661a8fe 100644
--- a/modules/entry/front/basic-data/index.html
+++ b/modules/entry/front/basic-data/index.html
@@ -110,7 +110,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/entry/front/create/index.html b/modules/entry/front/create/index.html
index 0662615aea..ed08b5c76c 100644
--- a/modules/entry/front/create/index.html
+++ b/modules/entry/front/create/index.html
@@ -50,7 +50,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Create"></vn-submit>
-        <vn-button ui-sref="entry.index" label="Cancel"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="entry.index"></vn-button>
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/item/front/barcode/index.html b/modules/item/front/barcode/index.html
index ade4c2f7d1..8d6cb3af82 100644
--- a/modules/item/front/barcode/index.html
+++ b/modules/item/front/barcode/index.html
@@ -42,6 +42,16 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index 0a40328b14..3f049675c4 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -158,8 +158,16 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-            <vn-submit label="Save"></vn-submit>
-            <vn-button label="Undo changes" ng-if="$ctrl.$scope.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 
diff --git a/modules/item/front/botanical/index.html b/modules/item/front/botanical/index.html
index 135a55e6f9..052e7d9e43 100644
--- a/modules/item/front/botanical/index.html
+++ b/modules/item/front/botanical/index.html
@@ -45,11 +45,16 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button
-            ng-if="watcher.dataChanged()"
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
             label="Undo changes"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
-        </vn-button>
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/item/front/create/index.html b/modules/item/front/create/index.html
index 1756852c98..6deaab1cdd 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -61,9 +61,11 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
+            disabled="!watcher.dataChanged()"
             label="Create">
         </vn-submit>
         <vn-button
+            class="cancel"
             label="Cancel"
             ui-sref="item.index">
         </vn-button>
diff --git a/modules/item/front/niche/index.html b/modules/item/front/niche/index.html
index cb616a4093..1c376b90e1 100644
--- a/modules/item/front/niche/index.html
+++ b/modules/item/front/niche/index.html
@@ -57,6 +57,16 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/item/front/tags/index.html b/modules/item/front/tags/index.html
index d773e8ee4d..0dca863fd5 100644
--- a/modules/item/front/tags/index.html
+++ b/modules/item/front/tags/index.html
@@ -73,6 +73,9 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/item/front/tax/index.html b/modules/item/front/tax/index.html
index 39feaa13dc..e993f974fb 100644
--- a/modules/item/front/tax/index.html
+++ b/modules/item/front/tax/index.html
@@ -28,7 +28,16 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html
index 63fb5c1b95..7ad73e1be0 100644
--- a/modules/order/front/basic-data/index.html
+++ b/modules/order/front/basic-data/index.html
@@ -66,7 +66,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/order/front/create/index.html b/modules/order/front/create/index.html
index 11de7ff6cb..86df579a61 100644
--- a/modules/order/front/create/index.html
+++ b/modules/order/front/create/index.html
@@ -3,7 +3,14 @@
         <vn-order-create-card vn-id="card" on-save=""></vn-order-create-card>
     </vn-card>
     <vn-button-bar>
-        <vn-submit ng-click="$ctrl.onSubmit()" label="Create">   
+        <vn-submit
+            ng-click="$ctrl.onSubmit()"
+            label="Create">
         </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="order.index">
+        </vn-button>
     </vn-button-bar>
 </div>
\ No newline at end of file
diff --git a/modules/route/front/basic-data/index.html b/modules/route/front/basic-data/index.html
index 4f05680ed6..0a1734ff2a 100644
--- a/modules/route/front/basic-data/index.html
+++ b/modules/route/front/basic-data/index.html
@@ -80,7 +80,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/route/front/create/index.html b/modules/route/front/create/index.html
index 0956297cca..754bed9f42 100644
--- a/modules/route/front/create/index.html
+++ b/modules/route/front/create/index.html
@@ -43,7 +43,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Create"></vn-submit>
-        <vn-button ui-sref="route.index" label="Cancel"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="route.index">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/supplier/front/basic-data/index.html b/modules/supplier/front/basic-data/index.html
index a39f07da2f..72accfb5f3 100644
--- a/modules/supplier/front/basic-data/index.html
+++ b/modules/supplier/front/basic-data/index.html
@@ -36,7 +36,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/supplier/front/contact/index.html b/modules/supplier/front/contact/index.html
index 1df85cb4af..be0b2b2aad 100644
--- a/modules/supplier/front/contact/index.html
+++ b/modules/supplier/front/contact/index.html
@@ -69,6 +69,16 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index a17a47319c..804be97845 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -163,8 +163,16 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="$ctrl.$.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 <!-- New postcode dialog -->
diff --git a/modules/ticket/front/create/index.html b/modules/ticket/front/create/index.html
index 3ec5627524..b1e73b34aa 100644
--- a/modules/ticket/front/create/index.html
+++ b/modules/ticket/front/create/index.html
@@ -3,7 +3,14 @@
         <vn-ticket-create-card vn-id="card" on-save=""></vn-ticket-create-card>
     </vn-card>
     <vn-button-bar>
-        <vn-submit ng-click="$ctrl.onSubmit()" label="Create">   
+        <vn-submit
+            ng-click="$ctrl.onSubmit()"
+            label="Create">
         </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="ticket.index">
+        </vn-button>
     </vn-button-bar>
 </div>
\ No newline at end of file
diff --git a/modules/ticket/front/dms/create/index.html b/modules/ticket/front/dms/create/index.html
index 54758aa830..a616ddaf8f 100644
--- a/modules/ticket/front/dms/create/index.html
+++ b/modules/ticket/front/dms/create/index.html
@@ -92,8 +92,15 @@
             </vn-vertical>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Upload"></vn-submit>
-            <vn-button ui-sref="ticket.card.dms.index" label="Cancel"></vn-button>
+            <vn-submit
+                ng-click="$ctrl.onSubmit()"
+                label="Upload">
+            </vn-submit>
+            <vn-button
+                class="cancel"
+                label="Cancel"
+                ui-sref="ticket.card.dms.index">
+            </vn-button>
         </vn-button-bar>
     </div>
 </form>
diff --git a/modules/ticket/front/note/index.html b/modules/ticket/front/note/index.html
index 32d93c6301..790e9581d8 100644
--- a/modules/ticket/front/note/index.html
+++ b/modules/ticket/front/note/index.html
@@ -57,6 +57,16 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/ticket/front/package/index.html b/modules/ticket/front/package/index.html
index 84d79fce39..c5d83edfb1 100644
--- a/modules/ticket/front/package/index.html
+++ b/modules/ticket/front/package/index.html
@@ -56,6 +56,16 @@
         </vn-icon-button>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/ticket/front/request/create/index.html b/modules/ticket/front/request/create/index.html
index 7dafbd8015..755e8cb513 100644
--- a/modules/ticket/front/request/create/index.html
+++ b/modules/ticket/front/request/create/index.html
@@ -41,8 +41,15 @@
             </vn-horizontal>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Create"></vn-submit>
-            <vn-button ui-sref="ticket.card.request.index" label="Cancel"></vn-button>
+            <vn-submit
+                disabled="!watcher.dataChanged()"
+                label="Create">
+            </vn-submit>
+            <vn-button
+                class="cancel"
+                label="Cancel"
+                ui-sref="ticket.card.request.index">
+            </vn-button>
         </vn-button-bar>
     </div>
 </form>
diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html
index 8f574a7fe7..9fc9e5a311 100644
--- a/modules/ticket/front/services/index.html
+++ b/modules/ticket/front/services/index.html
@@ -71,7 +71,17 @@
         </vn-icon-button>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
 
diff --git a/modules/ticket/front/tracking/edit/index.html b/modules/ticket/front/tracking/edit/index.html
index 6e9793708e..36362f1eac 100644
--- a/modules/ticket/front/tracking/edit/index.html
+++ b/modules/ticket/front/tracking/edit/index.html
@@ -33,7 +33,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ui-sref="ticket.card.tracking.index" label="Cancel"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="ticket.card.tracking.index">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/travel/front/basic-data/index.html b/modules/travel/front/basic-data/index.html
index 7e12949fd6..e7143ffc08 100644
--- a/modules/travel/front/basic-data/index.html
+++ b/modules/travel/front/basic-data/index.html
@@ -72,7 +72,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/travel/front/create/index.html b/modules/travel/front/create/index.html
index 652d2fbb97..1400ef6d7a 100644
--- a/modules/travel/front/create/index.html
+++ b/modules/travel/front/create/index.html
@@ -42,7 +42,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="travel.index">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/travel/front/thermograph/create/index.html b/modules/travel/front/thermograph/create/index.html
index c965c98673..a183390c0d 100644
--- a/modules/travel/front/thermograph/create/index.html
+++ b/modules/travel/front/thermograph/create/index.html
@@ -109,8 +109,15 @@
             </vn-horizontal>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Upload"></vn-submit>
-            <vn-button ui-sref="travel.card.thermograph.index" label="Cancel"></vn-button>
+            <vn-submit
+                disabled="!watcher.dataChanged()"
+                label="Upload">
+            </vn-submit>
+            <vn-button
+                class="cancel"
+                label="Cancel"
+                ui-sref="travel.card.thermograph.index">
+            </vn-button>
         </vn-button-bar>
     </div>
 </form>
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index bdc309c002..a2cbbc637b 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -33,7 +33,15 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/worker/front/dms/create/index.html b/modules/worker/front/dms/create/index.html
index dcafa59868..3495bf2606 100644
--- a/modules/worker/front/dms/create/index.html
+++ b/modules/worker/front/dms/create/index.html
@@ -76,8 +76,14 @@
             </vn-vertical>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Upload"></vn-submit>
-            <vn-button ui-sref="worker.card.dms.index" label="Cancel"></vn-button>
+            <vn-submit
+                label="Upload">
+            </vn-submit>
+            <vn-button
+                class="cancel"
+                label="Cancel"
+                ui-sref="worker.card.dms.index"></vn-button>
+            </vn-button>
         </vn-button-bar>
     </div>
 </form>
diff --git a/modules/worker/front/pbx/index.html b/modules/worker/front/pbx/index.html
index 5118d38ede..e1ca61a4a7 100644
--- a/modules/worker/front/pbx/index.html
+++ b/modules/worker/front/pbx/index.html
@@ -14,10 +14,14 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
         <vn-button
+            class="cancel"
             label="Undo changes"
-            ng-if="form.$dirty"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button>
     </vn-button-bar>
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>