diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 90c6a11469..6232ccca70 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -14,12 +14,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.4.237",
-  "_release": "1.4.237",
+  "version": "1.4.239",
+  "_release": "1.4.239",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.237",
-    "commit": "41b1a7ea6d039a5e431ceb1295f7e50ba2e54c2c"
+    "tag": "1.4.239",
+    "commit": "0ec984aee68fd5745adc13ba2bbbcf1bafcd995e"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.1",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
index 8bbfd86f4b..3895d58e2d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
@@ -15,7 +15,7 @@ define(['dialog', 'globalize'], function (dialog, globalize) {
         var items = [];
 
         items.push({
-            name: globalize.translate('sharedcomponents#ButtonOk'),
+            name: globalize.translate('sharedcomponents#ButtonGotIt'),
             id: 'ok',
             type: 'submit'
         });
diff --git a/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.js b/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.js
index 6677cc4e43..f82200c10d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.js
@@ -299,6 +299,10 @@
                 hasChanges = true;
                 reload(page);
             });
+        }, function () {
+            require(['alert'], function (alert) {
+                alert('This feature is coming soon to Emby Theater.');
+            });
         });
     }
 
@@ -393,6 +397,10 @@
                         reload(page);
                     }
                 });
+            }, function () {
+                require(['alert'], function (alert) {
+                    alert('This feature is coming soon to Emby Theater.');
+                });
             });
         });
 
diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json
index 25eb84c037..a96f0f050e 100644
--- a/dashboard-ui/bower_components/polymer/.bower.json
+++ b/dashboard-ui/bower_components/polymer/.bower.json
@@ -32,14 +32,14 @@
     "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
   },
   "private": true,
-  "homepage": "https://github.com/polymer/polymer",
+  "homepage": "https://github.com/Polymer/polymer",
   "_release": "1.6.1",
   "_resolution": {
     "type": "version",
     "tag": "v1.6.1",
     "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
   },
-  "_source": "git://github.com/polymer/polymer.git",
+  "_source": "git://github.com/Polymer/polymer.git",
   "_target": "^1.1.0",
-  "_originalSource": "polymer/polymer"
+  "_originalSource": "Polymer/polymer"
 }
\ No newline at end of file
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 5464094c17..36bf270687 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -90,7 +90,7 @@
                     </div>
                 </div>
                 <br />
-                <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="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
                 <p>${CinemaModeConfigurationHelp2}</p>
             </form>
         </div>
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 35de4069c3..9936f3c884 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -94,7 +94,7 @@
                 </div>
 
                 <div>
-                    <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="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 3bce2020ca..892b1082a2 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -87,7 +87,7 @@
                 </div>
 
                 <br />
-                <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="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
 
             </form>
 
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 98b0a2dadc..f4daea22dc 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -62,7 +62,7 @@
                 </div>
 
                 <div>
-                    <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="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index 953f8b8ea0..6998cc3f04 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -57,9 +57,13 @@
                 </div>
                 <div>
                     <br />
-                    <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="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</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>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">
+                        <span>${ButtonCancel}</span>
+                    </button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index 1a1c6de4b7..43b35823f8 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -25,7 +25,7 @@
 
 
                 <br />
-                <div><button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
+                <div><button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button></div>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 477e8a803b..02c8a17bbe 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -1256,7 +1256,7 @@
                 errorMsg += '<br/>';
                 errorMsg += Globalize.translate('MessageEnsureOpenTuner');
             }
-            else if (mediaSource && mediaSource.VideoType != "VideoFile") {
+            else if (mediaSource && mediaSource.VideoType && mediaSource.VideoType != "VideoFile") {
                 errorMsg += '<br/>';
                 errorMsg += '<br/>';
                 errorMsg += Globalize.translate('MessageFolderRipPlaybackExperimental');
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index 4e0c4bcb1d..35ab9e54c3 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -443,7 +443,7 @@
 
                 html += '</div>';
 
-                var scrollX = enableScrollX() && dom.getWindowSize().innerWidth >= 640;
+                var scrollX = enableScrollX() && dom.getWindowSize().innerWidth >= 600;
 
                 if (scrollX) {
                     html += '<div is="emby-itemscontainer" class="hiddenScrollX itemsContainer">';
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 7dab292ebd..ef4fd9de27 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -1,4 +1,4 @@
-define(['jQuery'], function ($) {
+define(['jQuery', 'fnchecked'], function ($) {
 
     function loadMediaFolders(page, user, mediaFolders) {
 
diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html
index 86bf02f6b1..1d27e54242 100644
--- a/dashboard-ui/streamingsettings.html
+++ b/dashboard-ui/streamingsettings.html
@@ -18,7 +18,7 @@
                     </select>
                     <div class="fieldDescription">${LabelChannelStreamQualityHelp}</div>
                 </div>
-                <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="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index 966c1f8935..6bd52f982d 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 button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</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>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index 9feae19b85..6aeece90f9 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -40,9 +40,13 @@
 
                 <br />
                 <div>
-                    <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="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</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>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">
+                        <span>${ButtonCancel}</span>
+                    </button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 955990f9f5..8994b19a41 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -51,7 +51,9 @@
                     <br />
                 </div>
                 <div>
-                    <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="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>
                 </div>
 
             </form>