diff --git a/dashboard-ui/components/itemidentifier/itemidentifier.template.html b/dashboard-ui/components/itemidentifier/itemidentifier.template.html
index ed7cfa0fc..a7248734d 100644
--- a/dashboard-ui/components/itemidentifier/itemidentifier.template.html
+++ b/dashboard-ui/components/itemidentifier/itemidentifier.template.html
@@ -1,5 +1,5 @@
 <div class="dialogHeader">
-    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
+    <paper-icon-button icon="arrow-back" class="btnCancel" tabindex="-1"></paper-icon-button>
     <div class="dialogHeaderTitle">
     </div>
 </div>
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index 44863a431..b50507018 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -1,5 +1,5 @@
 <div class="dialogHeader">
-    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
+    <paper-icon-button icon="arrow-back" class="btnCancel" tabindex="-1"></paper-icon-button>
     <div class="dialogHeaderTitle">
         ${ButtonEdit}
     </div>
diff --git a/dashboard-ui/components/metadataeditor/personeditor.template.html b/dashboard-ui/components/metadataeditor/personeditor.template.html
index cf8fb5d60..fa4be5936 100644
--- a/dashboard-ui/components/metadataeditor/personeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/personeditor.template.html
@@ -1,5 +1,5 @@
 <div class="dialogHeader">
-    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
+    <paper-icon-button icon="arrow-back" class="btnCancel" tabindex="-1"></paper-icon-button>
     <div class="dialogHeaderTitle">
         ${ButtonEdit}
     </div>
diff --git a/dashboard-ui/components/recordingcreator/recordingcreator.js b/dashboard-ui/components/recordingcreator/recordingcreator.js
index 72729b4e4..29fa70537 100644
--- a/dashboard-ui/components/recordingcreator/recordingcreator.js
+++ b/dashboard-ui/components/recordingcreator/recordingcreator.js
@@ -227,6 +227,12 @@
             }
         }
 
+        if (AppInfo.enableSupporterMembership) {
+            context.querySelector('.btnSupporterForConverting a').href = 'https://emby.media/premiere';
+        } else {
+            context.querySelector('.btnSupporterForConverting a').href = '#';
+        }
+
         ApiClient.getNamedConfiguration("livetv").then(function (config) {
 
             $('#chkConvertRecordings', context).checked(config.EnableRecordingEncoding);
diff --git a/dashboard-ui/components/recordingcreator/recordingcreator.template.html b/dashboard-ui/components/recordingcreator/recordingcreator.template.html
index 5fb8ff7ec..b88f0e5b6 100644
--- a/dashboard-ui/components/recordingcreator/recordingcreator.template.html
+++ b/dashboard-ui/components/recordingcreator/recordingcreator.template.html
@@ -49,7 +49,7 @@
         <br />
         <paper-checkbox id="chkConvertRecordings">${OptionConvertRecordingsToStreamingFormat}</paper-checkbox>
         <div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div>
-        <div class="fieldDescription paperCheckboxFieldDescription hide btnSupporter"><a href="http://emby.media/premiere" target="_blank">${ButtonLearnMore}</a></div>
+        <div class="fieldDescription paperCheckboxFieldDescription btnSupporterForConverting"><a href="https://emby.media/premiere" target="_blank" class="accent">${FeatureRequiresEmbyPremiere}</a></div>
     </div>
     <br />
     <div class="advancedToggle hide">
@@ -69,7 +69,10 @@
             <a class="clearLink btnSupporter hide" href="http://emby.media/premiere" target="_blank"><paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button></a>
         </div>
         <button type="submit" data-role="none" class="clearButton btnSubmitContainer">
-            <paper-button raised class="submit block" style="background:#cc3333;"><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></paper-button>
+            <paper-button raised class="submit block" style="background:#cc3333;" autoFocus><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></paper-button>
         </button>
     </div>
+    <br />
+    <br />
+    <br />
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 5032f6129..c85107cf0 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -641,6 +641,10 @@ h1 a:hover {
     text-decoration: underline;
 }
 
+.ui-body-b a.accent {
+    color: #52B54B !important;
+}
+
 .ui-listview li h3 {
     font-weight: 400;
 }
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index dc1354538..93094a3dc 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -55,7 +55,7 @@
                     <div>
                         <paper-checkbox id="chkConvertRecordings">${OptionConvertRecordingsToStreamingFormat}</paper-checkbox>
                         <div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div>
-                        <div class="fieldDescription paperCheckboxFieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank" style="display:none;">${ButtonLearnMore}</a></div>
+                        <div class="fieldDescription paperCheckboxFieldDescription btnSupporterForConverting"><a href="https://emby.media/premiere" target="_blank" class="accent">${FeatureRequiresEmbyPremiere}</a></div>
                     </div>
                     <br />
                     <br />
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js
index 54c572173..aab6ce434 100644
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@@ -81,9 +81,9 @@
         });
 
         if (AppInfo.enableSupporterMembership) {
-            $('.lnkSupporterLearnMore', page).show();
+            page.querySelector('.btnSupporterForConverting a').href = 'https://emby.media/premiere';
         } else {
-            $('.lnkSupporterLearnMore', page).hide();
+            page.querySelector('.btnSupporterForConverting a').href = '#';
         }
 
     });
diff --git a/dashboard-ui/strings/html/en-US.json b/dashboard-ui/strings/html/en-US.json
index cca7e26b0..fc786c688 100644
--- a/dashboard-ui/strings/html/en-US.json
+++ b/dashboard-ui/strings/html/en-US.json
@@ -1535,5 +1535,6 @@
     "LabelCodecIntrosPath": "Codec intros path:",
     "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices. This feature requires an active Emby Premiere subscription."
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription."
 }
\ No newline at end of file
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index 92ed2fd91..38c871a8e 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -1550,5 +1550,6 @@
     "LabelCodecIntrosPath": "Codec intros path:",
     "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices. This feature requires an active Emby Premiere subscription."
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription."
 }