diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index 673f301c1e..349416a979 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -7,6 +7,26 @@
     text-align: center
 }
 
+.btnArrowUp{
+    border-radius: 40% 40% 10% 10%;
+}
+
+.btnArrowLeft{
+    border-radius: 40% 10% 10% 40%;
+}
+
+.btnArrowRight{
+    border-radius: 10% 40% 40% 10%;
+}
+
+.btnArrowDown{
+    border-radius: 10% 10% 40% 40%;
+}
+
+.btnOk{
+    border-radius: 10%;
+}
+
 .nowPlayingPageTitle {
     margin: 0 0 .5em .5em
 }
@@ -151,6 +171,9 @@
     .nowPlayingInfoButtons .nowPlayingPageUserDataButtons {
         display: none !important
     }
+    .navigationSection .collapseContent i{
+        font-size: 4em;
+    }
 }
 
 @media all and (max-width:47em) {
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 3a48c2dbef..6c43e81756 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -215,23 +215,12 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
                 context.querySelector(".sendTextSection").classList.add("hide");
             }
 
-            if (!currentPlayer.isLocalPlayer) {
+            if (-1 != supportedCommands.indexOf("Select") && !currentPlayer.isLocalPlayer) {
                 context.querySelector(".navigationSection").classList.remove("hide");
             } else {
                 context.querySelector(".navigationSection").classList.add("hide");
             }
 
-            buttonVisible(context.querySelector(".btnArrowUp"), -1 != supportedCommands.indexOf("MoveUp"));
-            buttonVisible(context.querySelector(".btnArrowLeft"), -1 != supportedCommands.indexOf("MoveDown"));
-            buttonVisible(context.querySelector(".btnArrowRight"), -1 != supportedCommands.indexOf("MoveRight"));
-            buttonVisible(context.querySelector(".btnArrowDown"), -1 != supportedCommands.indexOf("MoveLeft"));
-            buttonVisible(context.querySelector(".btnOk"), -1 != supportedCommands.indexOf("Select"));
-            buttonVisible(context.querySelector(".btnBack"), -1 != supportedCommands.indexOf("Back"));
-            buttonVisible(context.querySelector(".btnContextMenu"), -1 != supportedCommands.indexOf("ToggleContextMenu"));
-            buttonVisible(context.querySelector(".btnShowSearch"), -1 != supportedCommands.indexOf("GoToSearch"));
-            buttonVisible(context.querySelector(".bthShowSettings"), -1 != supportedCommands.indexOf("GoToSettings"));
-            buttonVisible(context.querySelector(".btnGoHome"), -1 != supportedCommands.indexOf("GoHome"));
-
             buttonVisible(context.querySelector(".btnStop"), null != item);
             buttonVisible(context.querySelector(".btnNextTrack"), null != item);
             buttonVisible(context.querySelector(".btnPreviousTrack"), null != item);
diff --git a/src/nowplaying.html b/src/nowplaying.html
index 44b7e38163..bc595a6c90 100644
--- a/src/nowplaying.html
+++ b/src/nowplaying.html
@@ -72,67 +72,72 @@
                 </div>
             </div>
         </div>
-        <div class="navigationSection">
-            <br />
-            <div>
-                <button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize raised" 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 raised" title="${ButtonArrowLeft}" data-command="MoveLeft">
-                    <i class="md-icon">keyboard_arrow_left</i>
-                </button>
-                <button is="paper-icon-button-light" class="btnOk btnCommand autoSize raised" title="${ButtonOk}" data-command="Select">
-                    <i class="md-icon">keyboard_return</i>
-                </button>
-                <button is="paper-icon-button-light" class="btnArrowRight btnCommand autoSize raised" title="${ButtonArrowRight}" data-command="MoveRight">
-                    <i class="md-icon">keyboard_arrow_right</i>
-                </button>
-            </div>
-            <br />
-            <div>
-                <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 raised" 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">
-                    <i class="md-icon">menu</i>
-                </button>
-            </div>
-            <br />
-            <div>
-                <button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${ButtonHome}" data-command="GoHome">
-                    <i class="md-icon">home</i>
-                </button>
-                <button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${ButtonSearch}" data-command="GoToSearch">
-                    <i class="md-icon">search</i>
-                </button>
-                <button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${ButtonSettings}" data-command="GoToSettings">
-                    <i class="md-icon">settings</i>
-                </button>
+        <div>
+            <div class="navigationSection">
+                <div is="emby-collapse" title="${HeaderNavigation}">
+                    <div class="collapseContent">
+                        <div>
+                            <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 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 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 button-submit" title="${ButtonArrowRight}" data-command="MoveRight">
+                                <i class="md-icon">keyboard_arrow_right</i>
+                            </button>
+                        </div>
+                        <br />
+                        <div>
+                            <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 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">
+                                <i class="md-icon">menu</i>
+                            </button>
+                        </div>
+                        <br />
+                        <div>
+                            <button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${ButtonHome}" data-command="GoHome">
+                                <i class="md-icon">home</i>
+                            </button>
+                            <button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${ButtonSearch}" data-command="GoToSearch">
+                                <i class="md-icon">search</i>
+                            </button>
+                            <button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${ButtonSettings}" data-command="GoToSettings">
+                                <i class="md-icon">settings</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div>
             <div class="sendMessageSection">
                 <div is="emby-collapse" title="${HeaderSendMessage}">
-                <div class="collapseContent" style="text-align: left;">
-                    <form class="sendMessageForm">
-                        <div class="inputContainer">
-                            <input is="emby-input" class="sendMessageElement" type="text" id="txtMessageTitle" label="${LabelMessageTitle}" required />
-                        </div>
-                        <br />
-                        <div class="inputContainer">
-                            <input is="emby-input" class="sendMessageElement" type="text" id="txtMessageText" label="${LabelMessageText}" required />
-                        </div>
-                        <p>
-                            <button is="emby-button" class="sendMessageElement button-submit block raised" type="submit" raised>${ButtonSend}</button>
-                        </p>
-                    </form>
-                </div>
+                    <div class="collapseContent" style="text-align: left;">
+                        <form class="sendMessageForm">
+                            <div class="inputContainer">
+                                <input is="emby-input" class="sendMessageElement" type="text" id="txtMessageTitle" label="${LabelMessageTitle}" required />
+                            </div>
+                            <br />
+                            <div class="inputContainer">
+                                <input is="emby-input" class="sendMessageElement" type="text" id="txtMessageText" label="${LabelMessageText}" required />
+                            </div>
+                            <p>
+                                <button is="emby-button" class="sendMessageElement button-submit block raised" type="submit" raised>${ButtonSend}</button>
+                            </p>
+                        </form>
+                    </div>
                 </div>
             </div>
             <div class="sendTextSection">
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 6dea5a7892..c9c00f0da4 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -408,6 +408,7 @@
     "HeaderMyDevice": "My Device",
     "HeaderMyMedia": "My Media",
     "HeaderMyMediaSmall": "My Media (small)",
+    "HeaderNavigation": "Navigation",
     "HeaderNewApiKey": "New API Key",
     "HeaderNewDevices": "New Devices",
     "HeaderNextEpisodePlayingInValue": "Next Episode Playing in {0}",