diff --git a/main.js b/main.js
index 500ba7658..89baa7824 100644
--- a/main.js
+++ b/main.js
@@ -276,7 +276,7 @@ function createWindow() {
     })
 
     mainWindow.on('show', function () {
-        globalShortcut.unregister('CmdOrCtrl+M')
+        //globalShortcut.unregister('CmdOrCtrl+M')
 
         mediaControl.createThumbar(mainWindow, infoPlayerProvider.getAllInfo())
     })
@@ -1133,11 +1133,11 @@ function createWindow() {
 
             mainWindow.hide()
 
-            globalShortcut.register('CmdOrCtrl+M', function () {
+            /*globalShortcut.register('CmdOrCtrl+M', function () {
                 miniplayer.close()
                 miniplayer = undefined
                 mainWindow.show()
-            })
+            })*/
         }
     }
 
diff --git a/package-lock.json b/package-lock.json
index 743d4c778..7d2cdfb03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "youtube-music-desktop-app",
-    "version": "1.12.0",
+    "version": "1.12.1",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -1393,9 +1393,9 @@
             }
         },
         "electron": {
-            "version": "9.1.2",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-9.1.2.tgz",
-            "integrity": "sha512-xEYadr3XqIqJ4ktBPo0lhzPdovv4jLCpiUUGc2M1frUhFhwqXokwhPaTUcE+zfu5+uf/ONDnQApwjzznBsRrgQ==",
+            "version": "9.2.1",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-9.2.1.tgz",
+            "integrity": "sha512-ZsetaQjXB8+9/EFW1FnfK4ukpkwXCxMEaiKiUZhZ0ZLFlLnFCpe0Bg4vdDf7e4boWGcnlgN1jAJpBw7w0eXuqA==",
             "dev": true,
             "requires": {
                 "@electron/get": "^1.0.1",
@@ -1404,9 +1404,9 @@
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "12.12.53",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz",
-                    "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==",
+                    "version": "12.12.54",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.54.tgz",
+                    "integrity": "sha512-ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w==",
                     "dev": true
                 }
             }
diff --git a/package.json b/package.json
index 18f9460ee..157cd7b54 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
         }
     },
     "devDependencies": {
-        "electron": "^9.1.2",
+        "electron": "^9.2.1",
         "electron-builder": "^22.8.0",
         "electron-rebuild": "^1.11.0",
         "husky": "^4.2.5",
diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css
index 6b39422d8..e36b226f6 100644
--- a/src/assets/css/styles.css
+++ b/src/assets/css/styles.css
@@ -70,10 +70,6 @@ html, body {
     background: red;
 }
 
-.shortcut-or {
-    color: #888;
-}
-
 .center-flex {
     width: 100vw; 
     min-height: 100vh; 
diff --git a/src/locales/en.json b/src/locales/en.json
index 54e4b7931..0c7f3afe4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -80,5 +80,9 @@
     "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar",
     "LABEL_NOTIFICATION_LIKED": "You liked this song",
     "LABEL_NOTIFICATION_DISLIKED": "You disliked this song",
-    "LABEL_AUDIO": "Audio"
+    "LABEL_AUDIO": "Audio",
+    "LABEL_ALSO": "Also",
+    "LABEL_DISABLE": "Disable",
+    "LABEL_CANCEL": "Cancel",
+    "LABEL_SETTINGS_TAB_SHORTCUTS_PRESS_ANY_KEYS": "Press any key"
 }
diff --git a/src/locales/es.json b/src/locales/es.json
index 25da7ee30..b53ad0b3e 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -61,5 +61,14 @@
     "MEDIA_CONTROL_SEARCH": "Buscar",
     "MEDIA_CONTROL_SHUFFLE": "Mezclar",
     "MEDIA_CONTROL_THUMBS_DOWN": "No me gusta",
-    "MEDIA_CONTROL_THUMBS_UP": "Me gusta"
+    "MEDIA_CONTROL_THUMBS_UP": "Me gusta",
+    "LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION": "LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION",
+    "LABEL_SETTINGS_TAB_MINIPLAYER_RESIZABLE": "LABEL_SETTINGS_TAB_MINIPLAYER_RESIZABLE",
+    "LABEL_SETTINGS_TAB_MINIPLAYER_SHOW_TASK": "LABEL_SETTINGS_TAB_MINIPLAYER_SHOW_TASK",
+    "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE",
+    "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO",
+    "LABEL_ALSO": "LABEL_ALSO",
+    "MEDIA_CONTROL_VOLUME_UP": "MEDIA_CONTROL_VOLUME_UP",
+    "MEDIA_CONTROL_VOLUME_DOWN": "MEDIA_CONTROL_VOLUME_DOWN",
+    "LABEL_CHANGELOG": "LABEL_CHANGELOG"
 }
diff --git a/src/locales/pt.json b/src/locales/pt.json
index c001007c5..ec3accc60 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -68,13 +68,17 @@
     "MEDIA_CONTROL_REPEAT": "Repetir",
     "MEDIA_CONTROL_SEARCH": "Pesquisar",
     "MEDIA_CONTROL_SHUFFLE": "Misturar",
-    "MEDIA_CONTROL_THUMBS_DOWN": "Descurtir",
-    "MEDIA_CONTROL_THUMBS_UP": "Curtir",
+    "MEDIA_CONTROL_THUMBS_DOWN": "Não gostei",
+    "MEDIA_CONTROL_THUMBS_UP": "Gostei",
     "MEDIA_CONTROL_VOLUME_DOWN": "Diminuir volume",
     "MEDIA_CONTROL_VOLUME_UP": "Aumentar volume",
     "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE": "Habilitar serviço de mídia do Windows 10",
     "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Mostrar informação da faixa ao lado da barra de volume do Windows 10",
     "LABEL_NOTIFICATION_LIKED": "Você gostou desta música",
     "LABEL_NOTIFICATION_DISLIKED": "Você não gostou desta música",
-    "LABEL_AUDIO": "Áudio"
+    "LABEL_AUDIO": "Áudio",
+    "LABEL_ALSO": "Também",
+    "LABEL_DISABLE": "Desabilitar",
+    "LABEL_CANCEL": "Cancelar",
+    "LABEL_SETTINGS_TAB_SHORTCUTS_PRESS_ANY_KEYS": "Pressione qualquer tecla"
 }
diff --git a/src/locales/scaffold.json b/src/locales/scaffold.json
index 789baaee8..fe35c3155 100644
--- a/src/locales/scaffold.json
+++ b/src/locales/scaffold.json
@@ -76,5 +76,9 @@
     "LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO": "Show track information next to the Windows 10 volume bar",
     "LABEL_NOTIFICATION_LIKED": "You liked this song",
     "LABEL_NOTIFICATION_DISLIKED": "You disliked this song",
-    "LABEL_AUDIO": "Audio"
+    "LABEL_AUDIO": "Audio",
+    "LABEL_ALSO": "Also",
+    "LABEL_DISABLE": "Disable",
+    "LABEL_CANCEL": "Cancel",
+    "LABEL_SETTINGS_TAB_SHORTCUTS_PRESS_ANY_KEYS": "Press any key"
 }
diff --git a/src/pages/settings/settings.css b/src/pages/settings/settings.css
index 3e440d460..ad7041969 100644
--- a/src/pages/settings/settings.css
+++ b/src/pages/settings/settings.css
@@ -243,4 +243,14 @@ input[type=range]+.thumb {
 .text-disabled {
     text-decoration: line-through;
     text-transform: capitalize;
+}
+
+.shortcut-text {
+    color: #888;
+    text-transform: lowercase;
+    padding: 0 7px;
+}
+
+.normalize {
+    min-width: 70px;
 }
\ No newline at end of file
diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html
index b60479a75..29554c1c0 100644
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -194,6 +194,12 @@
                                             <span
                                                 i18n="i18n_LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION"
                                             ></span>
+                                            <sub
+                                                ><i
+                                                    class="material-icons tiny grey-text"
+                                                    >autorenew</i
+                                                ></sub
+                                            >
                                         </td>
                                         <td class="right">
                                             <div class="switch">
@@ -685,6 +691,12 @@
                                             <span
                                                 i18n="i18n_LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE"
                                             ></span>
+                                            <sub
+                                                ><i
+                                                    class="material-icons tiny grey-text"
+                                                    >autorenew</i
+                                                ></sub
+                                            >
                                         </td>
                                         <td class="right">
                                             <div class="switch">
@@ -709,6 +721,12 @@
                                             <span
                                                 i18n="i18n_LABEL_SETTINGS_TAB_INTEGRATION_WINDOWS10_MEDIA_SERVICE_SHOW_INFO"
                                             ></span>
+                                            <sub
+                                                ><i
+                                                    class="material-icons tiny grey-text"
+                                                    >autorenew</i
+                                                ></sub
+                                            >
                                         </td>
                                         <td class="right">
                                             <div class="switch">
@@ -740,19 +758,19 @@
                                 <div class="modal-footer black-text">
                                     <a
                                         id="disableAccelerator"
-                                        class="modal-close waves-effect waves-red btn-flat btn-sm orange left"
-                                        >Disable</a
-                                    >
+                                        class="modal-close waves-effect waves-red btn-flat btn-sm red left"
+                                        ><span i18n="i18n_LABEL_DISABLE"></span
+                                    ></a>
                                     <a
                                         id="cancelAccelerator"
                                         class="modal-close waves-effect waves-red btn-flat btn-sm black-text"
-                                        >Cancel</a
-                                    >
+                                        ><span i18n="i18n_LABEL_CANCEL"></span
+                                    ></a>
                                     <a
                                         id="saveAccelerator"
                                         class="modal-close waves-effect waves-green btn-flat btn-sm black-text"
-                                        >Save</a
-                                    >
+                                        ><span i18n="i18n_LABEL_SAVE"></span
+                                    ></a>
                                 </div>
                             </div>
 
@@ -780,11 +798,12 @@
                                                             >edit</i
                                                         >
                                                     </button>
-                                                    <span class="shortcut-or"
-                                                        >&nbsp;or&nbsp;</span
-                                                    >
+                                                    <span
+                                                        class="shortcut-text"
+                                                        i18n="i18n_LABEL_ALSO"
+                                                    ></span>
                                                     <a
-                                                        class="btn btn-small white black-text disable"
+                                                        class="btn btn-small white black-text disable normalize"
                                                     >
                                                         <i
                                                             class="material-icons media-icons"
@@ -816,11 +835,12 @@
                                                             >edit</i
                                                         >
                                                     </button>
-                                                    <span class="shortcut-or"
-                                                        >&nbsp;or&nbsp;</span
-                                                    >
+                                                    <span
+                                                        class="shortcut-text"
+                                                        i18n="i18n_LABEL_ALSO"
+                                                    ></span>
                                                     <a
-                                                        class="btn btn-small white black-text disable"
+                                                        class="btn btn-small white black-text disable normalize"
                                                     >
                                                         <i
                                                             class="material-icons media-icons"
@@ -849,11 +869,12 @@
                                                             >edit</i
                                                         >
                                                     </button>
-                                                    <span class="shortcut-or"
-                                                        >&nbsp;or&nbsp;</span
-                                                    >
+                                                    <span
+                                                        class="shortcut-text"
+                                                        i18n="i18n_LABEL_ALSO"
+                                                    ></span>
                                                     <a
-                                                        class="btn btn-small white black-text disable"
+                                                        class="btn btn-small white black-text disable normalize"
                                                     >
                                                         <i
                                                             class="material-icons media-icons"
diff --git a/src/pages/settings/settings.js b/src/pages/settings/settings.js
index 852d01fd0..49bffbd9d 100644
--- a/src/pages/settings/settings.js
+++ b/src/pages/settings/settings.js
@@ -463,8 +463,9 @@ function loadCustomKeys() {
 }
 
 function resetAcceleratorsText() {
-    document.querySelector('#modalEditAcceleratorKeys').innerText =
-        'Press any keys...'
+    document.querySelector('#modalEditAcceleratorKeys').innerText = `${__.trans(
+        'LABEL_SETTINGS_TAB_SHORTCUTS_PRESS_ANY_KEYS'
+    )}...`
 }
 
 document