diff --git a/app/assets/javascripts/components/theme_picker.ts b/app/assets/javascripts/components/theme_picker.ts
index 177bd7f4b9..dda37aba49 100644
--- a/app/assets/javascripts/components/theme_picker.ts
+++ b/app/assets/javascripts/components/theme_picker.ts
@@ -1,19 +1,23 @@
 import { ShadowlessLitElement } from "components/meta/shadowless_lit_element";
 import { html, TemplateResult } from "lit";
 import { customElement } from "lit/decorators.js";
-import { THEME_OPTIONS, ThemeOption, themeState } from "state/Theme";
+import { Theme, THEME_OPTIONS, ThemeOption, themeState } from "state/Theme";
 import { fetch } from "util.js";
 
 /**
  */
 @customElement("d-theme-picker")
 export class ThemePicker extends ShadowlessLitElement {
-    static THEME_ICON_MAP: Record<ThemeOption, string> = {
-        "light": "mdi-light-mode",
-        "dark": "mdi-dark-mode",
-        "auto": "mdi-tonality",
+    static THEME_ICON_MAP: Record<Theme, TemplateResult> = {
+        "light": html`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect fill="none" height="24" width="24"/><path d="M12,9c1.65,0,3,1.35,3,3s-1.35,3-3,3s-3-1.35-3-3S10.35,9,12,9 M12,7c-2.76,0-5,2.24-5,5s2.24,5,5,5s5-2.24,5-5 S14.76,7,12,7L12,7z M2,13l2,0c0.55,0,1-0.45,1-1s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S1.45,13,2,13z M20,13l2,0c0.55,0,1-0.45,1-1 s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S19.45,13,20,13z M11,2v2c0,0.55,0.45,1,1,1s1-0.45,1-1V2c0-0.55-0.45-1-1-1S11,1.45,11,2z M11,20v2c0,0.55,0.45,1,1,1s1-0.45,1-1v-2c0-0.55-0.45-1-1-1C11.45,19,11,19.45,11,20z M5.99,4.58c-0.39-0.39-1.03-0.39-1.41,0 c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0s0.39-1.03,0-1.41L5.99,4.58z M18.36,16.95 c-0.39-0.39-1.03-0.39-1.41,0c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0c0.39-0.39,0.39-1.03,0-1.41 L18.36,16.95z M19.42,5.99c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06c-0.39,0.39-0.39,1.03,0,1.41 s1.03,0.39,1.41,0L19.42,5.99z M7.05,18.36c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06 c-0.39,0.39-0.39,1.03,0,1.41s1.03,0.39,1.41,0L7.05,18.36z"/></svg>`,
+        "dark": html`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect fill="none" height="24" width="24"/><path d="M9.37,5.51C9.19,6.15,9.1,6.82,9.1,7.5c0,4.08,3.32,7.4,7.4,7.4c0.68,0,1.35-0.09,1.99-0.27C17.45,17.19,14.93,19,12,19 c-3.86,0-7-3.14-7-7C5,9.07,6.81,6.55,9.37,5.51z M12,3c-4.97,0-9,4.03-9,9s4.03,9,9,9s9-4.03,9-9c0-0.46-0.04-0.92-0.1-1.36 c-0.98,1.37-2.58,2.26-4.4,2.26c-2.98,0-5.4-2.42-5.4-5.4c0-1.81,0.89-3.42,2.26-4.4C12.92,3.04,12.46,3,12,3L12,3z"/></svg>`,
     };
 
+    static getThemeIcon(theme: ThemeOption): TemplateResult {
+        const t = theme == "auto" ? themeState.preferredTheme : theme;
+        return ThemePicker.THEME_ICON_MAP[t];
+    }
+
     selectTheme(theme: ThemeOption): void {
         themeState.selectedTheme = theme;
         fetch("/theme", {
@@ -27,12 +31,12 @@ export class ThemePicker extends ShadowlessLitElement {
         return html`
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                        <i class="mdi ${ThemePicker.THEME_ICON_MAP[themeState.selectedTheme]}"></i>
+                        ${ThemePicker.getThemeIcon(themeState.selectedTheme)}
                     <span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-end">
                     ${ THEME_OPTIONS.map(theme => html`
-                        <li><a class="dropdown-item" @click=${() => this.selectTheme(theme)}>
-                            <i class="mdi ${ThemePicker.THEME_ICON_MAP[theme]}"></i>
+                        <li><a class="dropdown-item ${themeState.selectedTheme == theme ? "active" : "" }" @click=${() => this.selectTheme(theme)}>
+                            ${ThemePicker.getThemeIcon(theme)}
                             ${I18n.t(`js.theme.${theme}`)}
                         </a></li>
                     `)}
diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index d221e55d0b..8bb6e3fd12 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -408,6 +408,11 @@
       },
       "submissions": "submissions",
       "submissions_on": "submissions on",
+      "theme": {
+        "auto": "Auto",
+        "dark": "Dark",
+        "light": "Light"
+      },
       "timeseries_desc": "This graph shows on which moments the students submitted the most solutions.",
       "timeseries_title": "Submissions over time",
       "total": "total",
@@ -918,6 +923,11 @@
       },
       "submissions": "oplossingen",
       "submissions_on": "ingediende oplossingen op",
+      "theme": {
+        "auto": "Auto",
+        "dark": "Donker",
+        "light": "Licht"
+      },
       "timeseries_desc": "Deze grafiek toont op welke momenten het meest aan een bepaalde oefening werd gewerkt.",
       "timeseries_title": "Ingediende oplossingen over tijd",
       "total": "totaal aantal",
diff --git a/app/assets/stylesheets/components.css.scss b/app/assets/stylesheets/components.css.scss
index a5ab00f8ca..5e3f8e44fa 100644
--- a/app/assets/stylesheets/components.css.scss
+++ b/app/assets/stylesheets/components.css.scss
@@ -27,6 +27,7 @@
 @import "components/courselabel-edit.css.scss";
 @import "components/action-card.css.scss";
 @import "components/progress_bar.css.scss";
+@import "components/themepicker.css.scss";
 
 .flex-spacer {
   flex-grow: 1;
diff --git a/app/assets/stylesheets/components/themepicker.css.scss b/app/assets/stylesheets/components/themepicker.css.scss
new file mode 100644
index 0000000000..06c523efa8
--- /dev/null
+++ b/app/assets/stylesheets/components/themepicker.css.scss
@@ -0,0 +1,13 @@
+d-theme-picker {
+  svg {
+    fill: currentcolor;
+    width: 24px;
+    height: 24px;
+  }
+
+  .dropdown-toggle {
+    svg {
+      vertical-align: inherit;
+    }
+  }
+}
diff --git a/config/locales/js/en.yml b/config/locales/js/en.yml
index f5bf3d67f9..8d03169bb5 100644
--- a/config/locales/js/en.yml
+++ b/config/locales/js/en.yml
@@ -315,4 +315,8 @@ en:
         show_all: Show all annotations
         hide_all: Hide all annotations
         show_errors: Only show errors
+    theme:
+      light: Light
+      dark: Dark
+      auto: Auto
 
diff --git a/config/locales/js/nl.yml b/config/locales/js/nl.yml
index 45fe793459..bfae11a89a 100644
--- a/config/locales/js/nl.yml
+++ b/config/locales/js/nl.yml
@@ -315,5 +315,9 @@ nl:
         show_all: Toon alle annotaties
         hide_all: Verberg alle annotaties
         show_errors: Enkel errors en opmerkingen tonen
+    theme:
+      light: Licht
+      dark: Donker
+      auto: Auto