diff --git a/src/nowplaying.html b/src/nowplaying.html
index 93543b6a0..ac5a2202d 100644
--- a/src/nowplaying.html
+++ b/src/nowplaying.html
@@ -79,19 +79,19 @@
                 <div is="emby-collapse" title="${HeaderNavigation}">
                     <div class="collapseContent">
                         <div>
-                            <button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize" title="${ButtonArrowUp}" data-command="MoveUp">
+                            <button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize button-submit" title="${ButtonArrowUp}" data-command="MoveUp">
                                 <i class="md-icon">keyboard_arrow_up</i>
                             </button>
                         </div>
                         <br />
                         <div>
-                            <button is="paper-icon-button-light" class="btnArrowLeft btnCommand autoSize" title="${ButtonArrowLeft}" data-command="MoveLeft">
+                            <button is="paper-icon-button-light" class="btnArrowLeft btnCommand autoSize button-submit" title="${ButtonArrowLeft}" data-command="MoveLeft">
                                 <i class="md-icon">keyboard_arrow_left</i>
                             </button>
-                            <button is="paper-icon-button-light" class="btnOk btnCommand autoSize" title="${ButtonOk}" data-command="Select">
+                            <button is="paper-icon-button-light" class="btnOk btnCommand autoSize button-submit" title="${ButtonOk}" data-command="Select">
                                 <i class="md-icon">keyboard_return</i>
                             </button>
-                            <button is="paper-icon-button-light" class="btnArrowRight btnCommand autoSize" title="${ButtonArrowRight}" data-command="MoveRight">
+                            <button is="paper-icon-button-light" class="btnArrowRight btnCommand autoSize button-submit" title="${ButtonArrowRight}" data-command="MoveRight">
                                 <i class="md-icon">keyboard_arrow_right</i>
                             </button>
                         </div>
@@ -100,7 +100,7 @@
                             <button is="paper-icon-button-light" class="btnBack btnCommand autoSize" title="${ButtonBack}" data-command="Back">
                                 <i class="md-icon">arrow_back</i>
                             </button>
-                            <button is="paper-icon-button-light" class="btnArrowDown btnCommand autoSize" title="${ButtonArrowDown}" data-command="MoveDown">
+                            <button is="paper-icon-button-light" class="btnArrowDown btnCommand autoSize button-submit" title="${ButtonArrowDown}" data-command="MoveDown">
                                 <i class="md-icon">keyboard_arrow_down</i>
                             </button>
                             <button is="paper-icon-button-light" class="btnContextMenu btnCommand autoSize" title="${ButtonInfo}" data-command="ToggleContextMenu">