diff --git a/src/controllers/dlnaprofile.js b/src/controllers/dlnaprofile.js
index 530e456018..b4e320e6e4 100644
--- a/src/controllers/dlnaprofile.js
+++ b/src/controllers/dlnaprofile.js
@@ -256,8 +256,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
                 currentType = profile.Type;
             }
 
-            html += "<li>";
-            html += '<a data-profileindex="' + i__y + '" class="lnkEditSubProfile" is="emby-linkbutton" href="#">';
+            html += "<div>";
+            html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i__y + '">';
             html += "<p>" + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "</p>";
 
             if ("Video" == profile.Type) {
@@ -270,8 +270,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
             }
 
             html += "</a>";
-            html += '<a is="emby-linkbutton" href="#" data-icon="delete" class="btnDeleteProfile" data-profileindex="' + i__y + '">Delete</a>';
-            html += "</li>";
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i__y + '"><i class="md-icon">delete</i></button>';
+            html += "</div>";
         }
 
         html += "</ul>";
@@ -316,8 +316,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
                 currentType = profile.Type;
             }
 
-            html += "<li>";
-            html += '<a data-profileindex="' + i__u + '" class="lnkEditSubProfile" is="emby-linkbutton" href="#">';
+            html += "<div>";
+            html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i__u + '">';
             html += "<p>Protocol: " + (profile.Protocol || "Http") + "</p>";
             html += "<p>" + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "</p>";
 
@@ -331,8 +331,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
             }
 
             html += "</a>";
-            html += '<a is="emby-linkbutton" href="#" data-icon="delete" class="btnDeleteProfile" data-profileindex="' + i__u + '">Delete</a>';
-            html += "</li>";
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i__u + '"><i class="md-icon">delete</i></button>';
+            html += "</div>";
         }
 
         html += "</ul>";
@@ -402,8 +402,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
                 currentType = profile.Type;
             }
 
-            html += "<li>";
-            html += '<a data-profileindex="' + i__i + '" class="lnkEditSubProfile" is="emby-linkbutton" href="#">';
+            html += "<div>";
+            html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i__i + '">';
             html += "<p>" + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "</p>";
 
             if (profile.Conditions && profile.Conditions.length) {
@@ -415,8 +415,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
             }
 
             html += "</a>";
-            html += '<a is="emby-linkbutton" href="#" data-icon="delete" class="btnDeleteProfile" data-profileindex="' + i__i + '">Delete</a>';
-            html += "</li>";
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i__i + '"><i class="md-icon">delete</i></button>';
+            html += "</div>";
         }
 
         html += "</ul>";
@@ -474,8 +474,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
                 currentType = type;
             }
 
-            html += "<li>";
-            html += '<a data-profileindex="' + i__p + '" class="lnkEditSubProfile" is="emby-linkbutton" href="#">';
+            html += "<div>";
+            html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i__p + '">';
             html += "<p>" + Globalize.translate("ValueCodec").replace("{0}", profile.Codec || allText) + "</p>";
 
             if (profile.Conditions && profile.Conditions.length) {
@@ -487,8 +487,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
             }
 
             html += "</a>";
-            html += '<a is="emby-linkbutton" href="#" data-icon="delete" class="btnDeleteProfile" data-profileindex="' + i__p + '">Delete</a>';
-            html += "</li>";
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i__p + '"><i class="md-icon">delete</i></button>';
+            html += "</div>";
         }
 
         html += "</ul>";
@@ -545,8 +545,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
                 currentType = profile.Type;
             }
 
-            html += "<li>";
-            html += '<a data-profileindex="' + i__s + '" class="lnkEditSubProfile" is="emby-linkbutton" href="#">';
+            html += "<div>";
+            html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i__s + '">';
             html += "<p>" + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "</p>";
 
             if ("Video" == profile.Type) {
@@ -567,8 +567,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in
             }
 
             html += "</a>";
-            html += '<a is="emby-linkbutton" href="#" data-icon="delete" class="btnDeleteProfile" data-profileindex="' + i__s + '">Delete</a>';
-            html += "</li>";
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i__s + '"><i class="md-icon">delete</i></button>';
+            html += "</div>";
         }
 
         html += "</ul>";
diff --git a/src/css/dashboard.css b/src/css/dashboard.css
index 5a44c51f27..e3eaebd239 100644
--- a/src/css/dashboard.css
+++ b/src/css/dashboard.css
@@ -499,3 +499,8 @@ a[data-role=button] {
     -webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37);
     box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37)
 }
+
+.ui-bar-a{
+    text-align: center;
+    padding: 0 20px;
+}
diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html
index 93c7207e4c..bbda88586a 100644
--- a/src/dlnaprofile.html
+++ b/src/dlnaprofile.html
@@ -1,17 +1,13 @@
 <div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs">
-
     <div data-role="content">
         <div class="content-primary">
-
             <form class="dlnaProfileForm" style="max-width: 650px;">
-
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle">${HeaderProfileInformation}</h2>
                         <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
                     </div>
                 </div>
-
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioInfo" data-value="tabInfo">${TabInfo}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioDirectPlay" data-value="tabDirectPlayProfiles">${TabDirectPlay}</a>
@@ -22,7 +18,6 @@
                 </div>
                 <br />
                 <div class="tabContent tabInfo">
-
                     <div class="inputContainer">
                         <input is="emby-input" type="text" id="txtName" required="required" label="${LabelName}" />
                     </div>
@@ -30,7 +25,6 @@
                         <select is="emby-select" id="selectUser" label="${LabelUserLibrary}"></select>
                         <div class="fieldDescription">${LabelUserLibraryHelp}</div>
                     </div>
-
                     <div>
                         <h3 class="checkboxListLabel">${LabelSupportedMediaTypes}</h3>
                         <div class="checkboxList paperList checkboxList-paperList">
@@ -62,7 +56,6 @@
                         <input type="checkbox" id="chkIgnoreTranscodeByteRangeRequests" data-mini="true" />
                         <div class="fieldDescription">${OptionIgnoreTranscodeByteRangeRequestsHelp}</div>
                     </div>
-
                     <div is="emby-collapse" title="${HeaderIdentification}">
                         <div class="collapseContent">
                             <h3>${HeaderIdentificationCriteriaHelp}</h3>
@@ -102,7 +95,6 @@
                                 <input is="emby-input" type="text" id="txtIdDeviceDescription" label="${LabelDeviceDescription}" />
                                 <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
                             </div>
-
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
                                 <button is="emby-button" type="button" class="fab btnAddIdentificationHttpHeader submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
@@ -112,11 +104,9 @@
                             <div class="httpHeaderIdentificationList"></div>
                         </div>
                     </div>
-
                     <div is="emby-collapse" title="${HeaderDisplaySettings}">
                         <div class="collapseContent">
                             <br />
-
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label>
                                     <input is="emby-checkbox" type="checkbox" id="chkRequiresPlainFolders" />
@@ -133,7 +123,6 @@
                             </div>
                         </div>
                     </div>
-
                     <div is="emby-collapse" title="${HeaderImageSettings}">
                         <div class="collapseContent">
                             <div class="checkboxContainer checkboxContainer-withDescription">
@@ -172,7 +161,6 @@
                             </div>
                         </div>
                     </div>
-
                     <div is="emby-collapse" title="${HeaderServerSettings}">
                         <div class="collapseContent">
                             <p>${HeaderProfileServerSettingsHelp}</p>
@@ -218,19 +206,16 @@
                             </div>
                         </div>
                     </div>
-
                     <div is="emby-collapse" title="${HeaderSubtitleProfiles}">
                         <div class="collapseContent">
                             <p>${HeaderSubtitleProfilesHelp}</p>
                             <button is="emby-button" type="button" class="raised submit block btnAddSubtitleProfile">
                                 <span>${ButtonAdd}</span>
                             </button>
-
                             <div class="subtitleProfileList"></div>
                             <br />
                         </div>
                     </div>
-
                     <div is="emby-collapse" title="${HeaderXmlSettings}">
                         <div class="collapseContent">
                             <div>
@@ -238,7 +223,6 @@
                                 <button is="emby-button" type="button" class="fab btnAddXmlDocumentAttribute submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
                                     <i class="md-icon">&#xE145;</i>
                                 </button>
-
                             </div>
                             <div class="xmlDocumentAttributeList"></div>
                             <div class="fieldDescription">${XmlDocumentAttributeListHelp}</div>
@@ -246,34 +230,33 @@
                         </div>
                     </div>
                 </div>
-
                 <div class="tabContent tabDirectPlayProfiles">
                     <p>${HeaderDirectPlayProfileHelp}</p>
-                    <button class="btnAddDirectPlayProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddDirectPlayProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
                     <br />
                     <div class="directPlayProfiles"></div>
                 </div>
                 <div class="tabContent tabTranscodingProfiles">
                     <p>${HeaderTranscodingProfileHelp}</p>
-                    <button class="btnAddTranscodingProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddTranscodingProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
                     <br />
                     <div class="transcodingProfiles"></div>
                 </div>
                 <div class="tabContent tabContainerProfiles">
                     <p>${HeaderContainerProfileHelp}</p>
-                    <button class="btnAddContainerProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddContainerProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
                     <br />
                     <div class="containerProfiles"></div>
                 </div>
                 <div class="tabContent tabCodecProfiles">
                     <p>${HeaderCodecProfileHelp}</p>
-                    <button class="btnAddCodecProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddCodecProfile" type="button" data-icon="plus">${ButtonNew}</button>
                     <br />
                     <div class="codecProfiles"></div>
                 </div>
                 <div class="tabContent tabMediaProfiles">
                     <p>${HeaderResponseProfileHelp}</p>
-                    <button class="btnAddResponseProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
+                    <button is="emby-button" class="raised submit block btnAddResponseProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button>
                     <br />
                     <div class="mediaProfiles"></div>
                 </div>
@@ -285,69 +268,56 @@
                     <button is="emby-button" type="button" class="button-cancel raised block" onclick="Dashboard.navigate('dlnaprofiles.html');">
                         <span>${ButtonCancel}</span>
                     </button>
-
                 </div>
             </form>
-
         </div>
     </div>
-    <div data-role="popup" id="popupEditDirectPlayProfile" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderDirectPlayProfile}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="editDirectPlayProfileForm">
-
-                <div style="margin: 1em 0;">
-                    <label for="selectDirectPlayProfileType">${LabelType}</label>
-                    <select id="selectDirectPlayProfileType" data-mini="true">
+    <div data-role="popup" id="popupEditDirectPlayProfile" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="editDirectPlayProfileForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderDirectPlayProfile}</h3>
+            </div>
+            <div data-role="content">
+                <div class="selectContainer">
+                    <select id="selectDirectPlayProfileType" name="selectDirectPlayProfileType" is="emby-select" label="${LabelType}">
                         <option value="Audio">${OptionProfileAudio}</option>
                         <option value="Photo">${OptionProfilePhoto}</option>
                         <option value="Video">${OptionProfileVideo}</option>
                     </select>
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="txtDirectPlayContainer">${LabelProfileContainer}</label>
-                    <input type="text" id="txtDirectPlayContainer" />
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtDirectPlayContainer" label="${LabelProfileContainer}" />
                     <div class="fieldDescription">${LabelProfileContainersHelp}</div>
                 </div>
-
                 <div id="fldDirectPlayVideoCodec" style="margin: 1em 0;">
-                    <label for="txtDirectPlayVideoCodec">${LabelProfileVideoCodecs}</label>
-                    <input type="text" id="txtDirectPlayVideoCodec" />
-                    <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="txtDirectPlayVideoCodec" label="${LabelProfileVideoCodecs}" />
+                        <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    </div>
                 </div>
-
                 <div id="fldDirectPlayAudioCodec" style="margin: 1em 0 2em;">
-                    <label for="txtDirectPlayAudioCodec">${LabelProfileAudioCodecs}</label>
-                    <input type="text" id="txtDirectPlayAudioCodec" />
-                    <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="txtDirectPlayAudioCodec" label="${LabelProfileAudioCodecs}" />
+                        <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    </div>
                 </div>
-
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-    <div data-role="popup" id="transcodingProfilePopup" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderTranscodingProfile}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="transcodingProfileForm" style="min-width: 250px;">
-
+    <div data-role="popup" id="transcodingProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="transcodingProfileForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderTranscodingProfile}</h3>
+            </div>
+            <div data-role="content">
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
                     <input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingBasics" value="tabTranscodingBasics">
                     <label for="radioTranscodingBasics">${TabInfo}</label>
@@ -356,321 +326,260 @@
                 </div>
                 <br />
                 <div class="tabContent tabTranscodingBasics" style="display: none;">
-                    <div style="margin: 1em 0;">
-                        <label for="selectTranscodingProfileType">${LabelType}</label>
-                        <select id="selectTranscodingProfileType" data-mini="true">
+                    <div class="selectContainer">
+                        <select id="selectTranscodingProfileType" name="selectTranscodingProfileType" is="emby-select" label="${LabelType}">
                             <option value="Audio">${OptionProfileAudio}</option>
                             <option value="Photo">${OptionProfilePhoto}</option>
                             <option value="Video">${OptionProfileVideo}</option>
                         </select>
                     </div>
-
                     <div id="fldTranscodingProtocol" style="margin: 1em 0;">
-                        <label for="selectTranscodingProtocol">${LabelProtocol}</label>
-                        <select id="selectTranscodingProtocol" data-mini="true">
-                            <option value="Http">${OptionProtocolHttp}</option>
-                            <option value="Hls">${OptionProtocolHls}</option>
-                        </select>
+                        <div class="selectContainer">
+                            <select id="selectTranscodingProtocol" name="selectTranscodingProtocol" is="emby-select" label="${LabelProtocol}">
+                                <option value="Http">${OptionProtocolHttp}</option>
+                                <option value="Hls">${OptionProtocolHls}</option>
+                            </select>
+                        </div>
                     </div>
-
-                    <div style="margin: 1em 0;">
-                        <label for="txtTranscodingContainer">${LabelTranscodingContainer}</label>
-                        <input type="text" id="txtTranscodingContainer" required="required" />
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="txtTranscodingContainer" label="${LabelTranscodingContainer}"; required="required" />
                     </div>
-
                     <div id="fldTranscodingVideoCodec" style="margin: 1em 0;">
-                        <label for="txtTranscodingVideoCodec">${LabelTranscodingVideoCodec}</label>
-                        <input type="text" id="txtTranscodingVideoCodec" />
+                        <div class="inputContainer">
+                            <input is="emby-input" type="text" id="txtTranscodingVideoCodec" label="${LabelTranscodingVideoCodec}" />
+                        </div>
                     </div>
-
                     <div id="fldTranscodingAudioCodec" style="margin: 1em 0;">
-                        <label for="txtTranscodingAudioCodec">${LabelTranscodingAudioCodec}</label>
-                        <input type="text" id="txtTranscodingAudioCodec" />
+                        <div class="inputContainer">
+                            <input is="emby-input" type="text" id="txtTranscodingAudioCodec" label="${LabelTranscodingAudioCodec}" />
+                        </div>
                     </div>
                 </div>
                 <div class="tabContent tabTranscodingAdvanced" style="display: none;">
-
                     <div id="fldEnableMpegtsM2TsMode" style="margin: 1em 0;">
-                        <label for="chkEnableMpegtsM2TsMode">${OptionEnableM2tsMode}</label>
-                        <input type="checkbox" id="chkEnableMpegtsM2TsMode" data-mini="true" />
-                        <div class="fieldDescription">${OptionEnableM2tsModeHelp}</div>
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="chkEnableMpegtsM2TsMode" />
+                                <span>${OptionEnableM2tsMode}</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">${OptionEnableM2tsModeHelp}</div>
+                        </div>
                     </div>
-
                     <div id="fldEstimateContentLength" style="margin: 1em 0;">
-                        <label for="chkEstimateContentLength">${OptionEstimateContentLength}</label>
-                        <input type="checkbox" id="chkEstimateContentLength" data-mini="true" />
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="chkEstimateContentLength" />
+                                <span>${OptionEstimateContentLength}</span>
+                            </label>
+                        </div>
                     </div>
-
                     <div id="fldReportByteRangeRequests" style="margin: 1em 0;">
-                        <label for="chkReportByteRangeRequests">${OptionReportByteRangeSeekingWhenTranscoding}</label>
-                        <input type="checkbox" id="chkReportByteRangeRequests" data-mini="true" />
-                        <div class="fieldDescription">${OptionReportByteRangeSeekingWhenTranscodingHelp}</div>
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="chkReportByteRangeRequests" />
+                                <span>${OptionReportByteRangeSeekingWhenTranscoding}</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">${OptionReportByteRangeSeekingWhenTranscodingHelp}</div>
+                        </div>
                     </div>
                 </div>
-
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-    <div data-role="popup" id="containerProfilePopup" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderContainerProfile}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="containerProfileForm" style="min-width: 250px;">
-
+    <div data-role="popup" id="containerProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="containerProfileForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderContainerProfile}</h3>
+            </div>
+            <div data-role="content">
                 <p>${HeaderContainerProfileHelp}</p>
-
-                <!--                    <div data-role="controlgroup" data-type="horizontal" data-mini="true">
-                    <input type="radio" name="radioContainerProfileTab" class="radioTabButton" id="radioContainerProfileInfo" value="tabContainerBasics">
-                    <label for="radioContainerProfileInfo">${TabInfo}</label>
-                    <input type="radio" name="radioContainerProfileTab" class="radioTabButton" id="radioContainerProfileConditions" value="tabContainerConditions">
-                    <label for="radioContainerProfileConditions">Conditions</label>
-                </div>-->
-
                 <div class="tabContent tabContainerBasics">
-                    <div style="margin: 1em 0;">
-                        <label for="selectContainerProfileType">${LabelType}</label>
-                        <select id="selectContainerProfileType" data-mini="true">
+                    <div class="selectContainer">
+                        <select id="selectContainerProfileType" name="selectContainerProfileType" is="emby-select" label="${LabelType}">
                             <option value="Audio">${OptionProfileAudio}</option>
                             <option value="Photo">${OptionProfilePhoto}</option>
                             <option value="Video">${OptionProfileVideo}</option>
                         </select>
                     </div>
-
-                    <div style="margin: 1em 0;">
-                        <label for="txtContainerProfileContainer">Containers:</label>
-                        <input type="text" id="txtContainerProfileContainer" />
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="txtContainerProfileContainer" label="${LabelProfileContainer}" />
                         <div class="fieldDescription">${LabelProfileContainersHelp}</div>
                     </div>
-
                 </div>
-
-                <div class="tabContent tabContainerConditions" style="display: none;">
-                </div>
-
+                <div class="tabContent tabContainerConditions" style="display: none;"></div>
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-    <div data-role="popup" id="codecProfilePopup" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderCodecProfile}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="codecProfileForm" style="min-width: 250px;">
-
+    <div data-role="popup" id="codecProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="codecProfileForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderCodecProfile}</h3>
+            </div>
+            <div data-role="content">
                 <p>${HeaderCodecProfileHelp}</p>
-
-                <div style="margin: 1em 0;">
-                    <label for="selectCodecProfileType">${LabelType}</label>
-                    <select id="selectCodecProfileType" data-mini="true">
+                <div class="selectContainer">
+                    <select id="selectCodecProfileType" name="selectCodecProfileType" is="emby-select" label="${LabelType}">
                         <option value="Video">${OptionProfileVideo}</option>
                         <option value="VideoAudio">${OptionProfileVideoAudio}</option>
                         <option value="Audio">${OptionProfileAudio}</option>
                     </select>
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="txtCodecProfileCodec">${LabelProfileCodecs}</label>
-                    <input type="text" id="txtCodecProfileCodec" />
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtCodecProfileCodec" label="${LabelProfileCodecs}" />
                     <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
                 </div>
-
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-    <div data-role="popup" id="responseProfilePopup" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderResponseProfile}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="editResponseProfileForm">
-
-                <div style="margin: 1em 0;">
-                    <label for="selectResponseProfileType">${LabelType}</label>
-                    <select id="selectResponseProfileType" data-mini="true">
+    <div data-role="popup" id="responseProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="editResponseProfileForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderResponseProfile}</h3>
+            </div>
+            <div data-role="content">
+                <div class="selectContainer">
+                    <select id="selectResponseProfileType" name="selectResponseProfileType" is="emby-select" label="${LabelType}">
                         <option value="Audio">${OptionProfileAudio}</option>
                         <option value="Photo">${OptionProfilePhoto}</option>
                         <option value="Video">${OptionProfileVideo}</option>
                     </select>
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="txtResponseProfileContainer">${LabelProfileContainer}</label>
-                    <input type="text" id="txtResponseProfileContainer" />
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtResponseProfileContainer" label="${LabelProfileContainer}" />
                     <div class="fieldDescription">${LabelProfileContainersHelp}</div>
                 </div>
-
                 <div id="fldResponseProfileVideoCodec" style="margin: 1em 0;">
-                    <label for="txtResponseProfileVideoCodec">${LabelProfileVideoCodecs}</label>
-                    <input type="text" id="txtResponseProfileVideoCodec" />
-                    <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="txtResponseProfileVideoCodec" label="${LabelProfileVideoCodecs}" />
+                        <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    </div>
                 </div>
-
                 <div id="fldResponseProfileAudioCodec" style="margin: 1em 0 2em;">
-                    <label for="txtResponseProfileAudioCodec">${LabelProfileAudioCodecs}</label>
-                    <input type="text" id="txtResponseProfileAudioCodec" />
-                    <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="txtResponseProfileAudioCodec" label="${LabelProfileAudioCodecs}" />
+                        <div class="fieldDescription">${LabelProfileCodecsHelp}</div>
+                    </div>
                 </div>
-
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-    <div data-role="popup" id="identificationHeaderPopup" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderIdentificationHeader}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="identificationHeaderForm">
-
-                <div style="margin: 1em 0;">
-                    <label for="txtIdentificationHeaderName">${LabelName}</label>
-                    <input type="text" id="txtIdentificationHeaderName" required="required" />
+    <div data-role="popup" id="identificationHeaderPopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="identificationHeaderForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderIdentificationHeader}</h3>
+            </div>
+            <div data-role="content">
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtIdentificationHeaderName" label="${LabelName}" />
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="txtIdentificationHeaderValue">${LabelValue}</label>
-                    <input type="text" id="txtIdentificationHeaderValue" required="required" />
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtIdentificationHeaderValue" label="${LabelValue}" />
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="selectMatchType">${LabelMatchType}</label>
-                    <select id="selectMatchType" data-mini="true">
+                <div class="selectContainer">
+                    <select id="selectMatchType" name="selectMatchType" is="emby-select" label="${LabelMatchType}">
                         <option value="Equals">${OptionEquals}</option>
                         <option value="Regex">${OptionRegex}</option>
                         <option value="Substring">${OptionSubstring}</option>
                     </select>
                 </div>
-
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-    <div data-role="popup" id="xmlAttributePopup" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderXmlDocumentAttribute}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="xmlAttributeForm">
-
-                <div style="margin: 1em 0;">
-                    <label for="txtXmlAttributeName">${LabelName}</label>
-                    <input type="text" id="txtXmlAttributeName" required="required" />
+    <div data-role="popup" id="xmlAttributePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="xmlAttributeForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderXmlDocumentAttribute}</h3>
+            </div>
+            <div data-role="content">
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtXmlAttributeName" label="${LabelName}" />
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="txtXmlAttributeValue">${LabelValue}</label>
-                    <input type="text" id="txtXmlAttributeValue" required="required" />
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtXmlAttributeValue" label="${LabelValue}" />
                 </div>
-
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-
-    <div data-role="popup" id="subtitleProfilePopup" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
-
-        <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-            <h3>${HeaderSubtitleProfile}</h3>
-        </div>
-
-        <div data-role="content">
-            <form class="subtitleProfileForm">
-
-                <div style="margin: 1em 0;">
-                    <label for="txtSubtitleProfileFormat">${LabelFormat}</label>
-                    <input type="text" id="txtSubtitleProfileFormat" required="required" />
+    <div data-role="popup" id="subtitleProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+        <form class="subtitleProfileForm" style="padding:1em;">
+            <div class="ui-bar-a">
+                <h3 class="sectionTitle">${HeaderSubtitleProfile}</h3>
+            </div>
+            <div data-role="content">
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtSubtitleProfileFormat" label="${LabelFormat}" />
                     <div class="fieldDescription">${LabelSubtitleFormatHelp}</div>
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="selectSubtitleProfileMethod">${LabelMethod}</label>
-                    <select id="selectSubtitleProfileMethod" data-mini="true" required="required">
+                <div class="selectContainer">
+                    <select id="selectSubtitleProfileMethod" name="selectSubtitleProfileMethod" is="emby-select" label="${LabelMethod}">
                         <option value="Embed">${OptionEmbedSubtitles}</option>
                         <option value="External">${OptionExternallyDownloaded}</option>
                         <option value="Hls">${OptionHlsSegmentedSubtitles}</option>
                     </select>
                 </div>
-
-                <div style="margin: 1em 0;">
-                    <label for="selectSubtitleProfileDidlMode">${LabelDidlMode}</label>
-                    <select id="selectSubtitleProfileDidlMode" data-mini="true">
+                <div class="selectContainer">
+                    <select id="selectSubtitleProfileDidlMode" name="selectSubtitleProfileDidlMode" is="emby-select" label="${LabelDidlMode}">
                         <option value="">${OptionResElement}</option>
                         <option value="CaptionInfoEx">${OptionCaptionInfoExSamsung}</option>
                     </select>
                 </div>
-
                 <p>
-                    <button type="submit" data-icon="check" data-mini="true">
-                        ${ButtonOk}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check" data-mini="true">
+                        <span>${ButtonOk}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');" data-mini="true">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </p>
-            </form>
-        </div>
-
+            </div>
+        </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/scheduledtask.html b/src/scheduledtask.html
index ad47d8eb41..4024199c9b 100644
--- a/src/scheduledtask.html
+++ b/src/scheduledtask.html
@@ -23,9 +23,9 @@
             </div>
         </div>
     </div>
-    <div data-role="popup" id="popupAddTrigger" class="dialog dialog-fixedSize dialog-small hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="popupAddTrigger" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
         <form class="addTriggerForm" style="padding:1em;">
-            <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
+            <div class="ui-bar-a">
                 <h3>${HeaderAddScheduledTaskTrigger}</h3>
             </div>
             <div data-role="content">
@@ -75,14 +75,14 @@
                     <input is="emby-input" id="txtTimeLimit" type="number" pattern="[0-9]*" min="1" step=".5" label="${LabelTimeLimitHours}" />
                 </div>
                 <div>
-                    <button type="submit" data-icon="check">
-                        ${ButtonAdd}
+                    <button is="emby-button" type="submit" class="raised button-submit block" data-icon="check">
+                        <span>${ButtonAdd}</span>
                     </button>
-                    <button type="button" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');">
-                        ${ButtonCancel}
+                    <button is="emby-button" type="button" class="raised button-cancel block" data-icon="delete" onclick="$(this).parents('.dialog').addClass('hide');">
+                        <span>${ButtonCancel}</span>
                     </button>
                 </div>
             </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>