diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index c9e993053..9d4b20eb6 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -107,9 +107,9 @@
                 </div>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index 57a2019b0..966c1f893 100644
--- a/dashboard-ui/userlibraryaccess.html
+++ b/dashboard-ui/userlibraryaccess.html
@@ -51,9 +51,9 @@
                 </div>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index ef36f15a2..955990f9f 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -51,7 +51,7 @@
                     <br />
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
 
             </form>
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index ec6a8c470..5cc87e526 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -30,8 +30,8 @@
                         </div>
                         <br />
                         <div>
-                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                            <button is="emby-button" type="button" id="btnResetPassword" class="raised cancel block hide">
+                            <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="button" id="btnResetPassword" class="raised button-cancel block hide">
                                 <i class="md-icon">lock</i>
                                 <span>${ButtonResetPassword}</span>
                             </button>
@@ -59,11 +59,11 @@
                             <div class="fieldDescription checkboxFieldDescription">${LabelInNetworkSignInWithEasyPasswordHelp}</div>
                         </div>
                         <div>
-                            <button is="emby-button" type="submit" class="raised submit block">
+                            <button is="emby-button" type="submit" class="raised button-submit block">
                                 <i class="md-icon">check</i>
                                 <span>${ButtonSave}</span>
                             </button>
-                            <button is="emby-button" type="button" id="btnResetEasyPassword" class="raised cancel block hide">
+                            <button is="emby-button" type="button" id="btnResetEasyPassword" class="raised button-cancel block hide">
                                 <i class="md-icon">lock</i>
                                 <span>${ButtonResetEasyPassword}</span>
                             </button>