diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
index 6e368cbd75..3f7b21e1d9 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
@@ -394,14 +394,16 @@ define(['browser'], function (browser) {
                 Type: 'Audio',
                 AudioCodec: audioFormat,
                 Context: 'Streaming',
-                Protocol: 'http'
+                Protocol: 'http',
+                MaxAudioChannels: physicalAudioChannels.toString()
             });
             profile.TranscodingProfiles.push({
                 Container: audioFormat,
                 Type: 'Audio',
                 AudioCodec: audioFormat,
                 Context: 'Static',
-                Protocol: 'http'
+                Protocol: 'http',
+                MaxAudioChannels: physicalAudioChannels.toString()
             });
         });
 
@@ -489,14 +491,6 @@ define(['browser'], function (browser) {
         profile.ContainerProfiles = [];
 
         profile.CodecProfiles = [];
-        profile.CodecProfiles.push({
-            Type: 'Audio',
-            Conditions: [{
-                Condition: 'LessThanEqual',
-                Property: 'AudioChannels',
-                Value: '2'
-            }]
-        });
 
         // Handle he-aac not supported
         if (!videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.5"').replace(/no/, '')) {
@@ -552,6 +546,12 @@ define(['browser'], function (browser) {
                 Value: 'true',
                 IsRequired: false
             },
+            {
+                Condition: 'NotEquals',
+                Property: 'IsAVC',
+                Value: 'true',
+                IsRequired: false
+            },
             {
                 Condition: 'EqualsAny',
                 Property: 'VideoProfile',
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css
index 613d2b8316..acb1c5c265 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css
@@ -2,7 +2,6 @@
     display: block;
     margin: 0;
     margin-bottom: 0 !important;
-    background: none;
     border: 1px solid #383838;
     border-width: 0 0 1px 0;
     /* Prefixed box-sizing rules necessary for older browsers */
@@ -15,17 +14,21 @@
     /* General select styles: change as needed */
     font-family: inherit;
     font-weight: inherit;
-    color: inherit;
     padding: .35em .8em .3em 0;
     cursor: pointer;
     outline: none !important;
     width: 100%;
+}
+
+.emby-select-withoptioncolor {
+    color: inherit;
+    background: none;
     -webkit-appearance: none;
     -moz-appearance: none;
     appearance: none;
 }
 
-    .emby-select option {
+    .emby-select-withoptioncolor > option {
         color: initial;
     }
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js
index 63dc61fd05..6dc0713b5f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js
@@ -118,6 +118,10 @@
             inputId++;
         }
 
+        if (!browser.firefox) {
+            this.classList.add('emby-select-withoptioncolor');
+        }
+
         this.addEventListener('mousedown', onMouseDown);
         this.addEventListener('keydown', onKeyDown);
 
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 290782f2ad..b97ffa2330 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -123,7 +123,11 @@ h1 a:hover {
     background-color: #fff;
 }
 
-.ui-body-a select, .ui-body-a [is="emby-input"], .ui-body-a [is="emby-textarea"] {
+.ui-body-a [is="emby-select"] {
+    border-color: #ccc !important;
+}
+
+.ui-body-a [is="emby-input"], .ui-body-a [is="emby-textarea"] {
     background: none;
     border-color: #ccc !important;
 }
@@ -350,15 +354,6 @@ div[data-role='page'] {
     color: #bbb;
 }
 
-.ui-body-a select {
-    background: none;
-    border-color: #757575;
-}
-
-    .ui-body-a select option {
-        color: #000;
-    }
-
 .ui-body-a .emby-collapsible-button {
     border-color: #ddd;
 }
diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css
index 23011f5efe..07f5fc46c1 100644
--- a/dashboard-ui/devices/ios/ios.css
+++ b/dashboard-ui/devices/ios/ios.css
@@ -6,10 +6,6 @@ body:not(.dashboardDocument) .mainDrawerButton {
     display: none !important;
 }
 
-.ui-body-b select {
-    -webkit-appearance: none;
-}
-
 .pageWithAbsoluteTabs:not(.noSecondaryNavPage) {
     padding-top: 88px !important;
 }