diff --git a/src/public/app/widgets/buttons/abstract_button.js b/src/public/app/widgets/buttons/abstract_button.js
index 44be3946d..7439d71e7 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 = `<button class="button-widget no-print" data-toggle="tooltip">
-    <span class="bx"></span>
-</button>`;
+const TPL = `<span class="button-widget bx"
+      data-toggle="tooltip"
+      title=""></span>`;
 
 export default class AbstractButtonWidget extends NoteContextAwareWidget {
     isEnabled() {
@@ -22,7 +22,6 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
 
     doRender() {
         this.$widget = $(TPL);
-        this.$iconSpan = this.$widget.find("span");
 
         if (this.settings.onContextMenu) {
             this.$widget.on("contextmenu", e => {
@@ -52,9 +51,9 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
     }
 
     refreshIcon() {
-        for (const className of this.$iconSpan[0].classList) {
+        for (const className of this.$widget[0].classList) {
             if (className.startsWith("bx-")) {
-                this.$iconSpan.removeClass(className);
+                this.$widget.removeClass(className);
             }
         }
 
@@ -62,7 +61,7 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
             ? this.settings.icon()
             : this.settings.icon;
 
-        this.$iconSpan.addClass(icon);
+        this.$widget.addClass(icon);
     }
 
     initialRenderCompleteEvent() {
diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js
index 89adaabad..86a3fd378 100644
--- a/src/public/app/widgets/buttons/global_menu.js
+++ b/src/public/app/widgets/buttons/global_menu.js
@@ -21,12 +21,12 @@ const TPL = `
         background-position: 50% 45%;
         width: 100%;
         height: 100%;
-        
         position: relative;
     }
     
     .global-menu-button:hover {
         background-image: url("${window.glob.assetPath}/images/icon-color.png");
+        border: 0;
     }
     
     .global-menu-button-update-available {