diff --git a/src/public/app/widgets/buttons/abstract_button.js b/src/public/app/widgets/buttons/abstract_button.js
index 7439d71e7..7e705d566 100644
--- a/src/public/app/widgets/buttons/abstract_button.js
+++ b/src/public/app/widgets/buttons/abstract_button.js
@@ -1,8 +1,8 @@
 import NoteContextAwareWidget from "../note_context_aware_widget.js";
 
-const TPL = `<span class="button-widget bx"
+const TPL = `<button class="button-widget bx"
       data-toggle="tooltip"
-      title=""></span>`;
+      title=""></button>`;
 
 export default class AbstractButtonWidget extends NoteContextAwareWidget {
     isEnabled() {
diff --git a/src/public/app/widgets/buttons/edit_button.js b/src/public/app/widgets/buttons/edit_button.js
index 3997b206a..dd9a7fc3b 100644
--- a/src/public/app/widgets/buttons/edit_button.js
+++ b/src/public/app/widgets/buttons/edit_button.js
@@ -39,12 +39,10 @@ export default class EditButton extends OnClickButtonWidget {
             // make the edit button stand out on the first display, otherwise
             // it's difficult to notice that the note is readonly
             if (this.isVisible() && !wasVisible) {
-                this.$iconSpan.addClass("bx-tada");
-                this.$widget.css("transform", "scale(2)");
+                this.$widget.addClass("bx-tada bx-lg");
 
                 setTimeout(() => {
-                    this.$iconSpan.removeClass("bx-tada bx-lg");
-                    this.$widget.css("transform", "scale(1)");
+                    this.$widget.removeClass("bx-tada bx-lg");
                 }, 1700);
             }
         }