diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index a36947dd4..23f0ea977 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -1,6 +1,8 @@
 @import "~theme/globals";
 
 :host {
+    max-width: 100%;
+
     ion-select,
     ion-button {
         --icon-margin: 0 8px;
diff --git a/src/core/features/course/components/format/core-course-format.html b/src/core/features/course/components/format/core-course-format.html
index c096739ec..191f9fb11 100644
--- a/src/core/features/course/components/format/core-course-format.html
+++ b/src/core/features/course/components/format/core-course-format.html
@@ -167,7 +167,7 @@
 
 <!-- Template to render a section download button/progress. -->
 <ng-template #sectionDownloadTemplate let-section="section">
-    <div *ngIf="section && downloadEnabled" slot="end" class="core-button-spinner core-section-download">
+    <div *ngIf="section && downloadEnabled" slot="end" class="core-button-spinner">
         <!-- Download progress. -->
         <ion-badge class="core-course-download-section-progress"
             *ngIf="section.isDownloading && section.total > 0 && section.count < section.total" role="progressbar"
diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss
index f5a535adb..2d6ee98e1 100644
--- a/src/core/features/course/components/format/format.scss
+++ b/src/core/features/course/components/format/format.scss
@@ -55,13 +55,18 @@
         }
     }
 
-    .core-section-download.core-button-spinner {
-        display: flex;
-        align-items: center;
-        @include margin-horizontal(10px);
+    .core-section-download {
+        core-combobox {
+            max-width: calc(100% - 64px);
+        }
+        .core-button-spinner {
+            display: flex;
+            align-items: center;
+            @include margin-horizontal(10px);
 
-        ion-badge.core-course-download-courses-progress {
-            @include margin(null, 12px, null, null);
+            ion-badge.core-course-download-courses-progress {
+                @include margin(null, 12px, null, null);
+            }
         }
     }
 
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index b4aebafba..fd498c32b 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -352,6 +352,17 @@ core-rich-text-editor .core-rte-editor {
         margin-bottom: 10px;
     }
 
+    select {
+        background-color: var(--background-contrast);
+        background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%23000000%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E');
+        background-repeat: no-repeat, repeat;
+        background-position: right .7em top 50%, 0 0;
+        background-size: .65em auto, 100%;
+        padding-right: 24px;
+        appearance: none;
+        -webkit-appearance: none;
+    }
+
     input[type=radio],
     input[type=checkbox] {
         position: relative;
@@ -701,3 +712,8 @@ ion-header.ios h1 core-format-text {
         margin-top: -10px;
     }
 }
+
+body.dark core-format-text select,
+body.dark core-rich-text-editor .core-rte-editor select {
+	background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%23FFFFFF%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E');
+}
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 624103315..e5feb8e46 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1,5 +1,9 @@
 @import "./globals.scss";
 
+body {
+    -webkit-text-size-adjust: auto;
+}
+
 // Common styles.
 .text-left           { text-align: left; }
 .text-right          { text-align: right; }