diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss
index 67c9b404f..a3fc386e2 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/modules/item/front/barcode/index.html b/modules/item/front/barcode/index.html
index 3815115d8..8d6cb3af8 100644
--- a/modules/item/front/barcode/index.html
+++ b/modules/item/front/barcode/index.html
@@ -43,8 +43,15 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            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 586b6eaba..3f049675c 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -159,10 +159,15 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
-        <vn-button label="Undo changes" ng-if="$ctrl.$scope.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <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 283132baa..052e7d9e4 100644
--- a/modules/item/front/botanical/index.html
+++ b/modules/item/front/botanical/index.html
@@ -46,13 +46,15 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
-        <vn-button
-            ng-if="watcher.dataChanged()"
+        <!-- # #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 a0a788a1c..6deaab1cd 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -61,10 +61,11 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            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 c40b4f6f3..1c376b90e 100644
--- a/modules/item/front/niche/index.html
+++ b/modules/item/front/niche/index.html
@@ -58,8 +58,15 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            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 b03c4bdc4..0dca863fd 100644
--- a/modules/item/front/tags/index.html
+++ b/modules/item/front/tags/index.html
@@ -74,7 +74,7 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
     </vn-button-bar>
diff --git a/modules/item/front/tax/index.html b/modules/item/front/tax/index.html
index 0abb70f28..e993f974f 100644
--- a/modules/item/front/tax/index.html
+++ b/modules/item/front/tax/index.html
@@ -29,13 +29,14 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             label="Save">
         </vn-submit>
         <!-- # #2680 Undo changes button bugs -->
         <!-- <vn-button
+            class="cancel"
             label="Undo changes"
-            ng-if="watcher.dataChanged()"
+            disabled="!watcher.dataChanged()"
             ng-click="watcher.loadOriginalData()">
         </vn-button> -->
     </vn-button-bar>