diff --git a/app/assets/stylesheets/inputs.css b/app/assets/stylesheets/inputs.css
index 366983d00..252ef2835 100644
--- a/app/assets/stylesheets/inputs.css
+++ b/app/assets/stylesheets/inputs.css
@@ -104,22 +104,24 @@
   .input--select {
     --input-border-radius: 2em;
     --input-padding: 0.5em 1.8em 0.5em 1.2em;
+    --caret-icon: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23000'/%3E%3C/svg%3E");
+    --caret-icon-dark: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23fff'/%3E%3C/svg%3E");
 
     -webkit-appearance: none;
     appearance: none;
-    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23000'/%3E%3C/svg%3E");
+    background-image: var(--caret-icon);
     background-size: 0.5em;
     background-position: center right 0.9em;
     background-repeat: no-repeat;
     text-align: start;
 
     html[data-theme="dark"] & {
-      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23fff'/%3E%3C/svg%3E");
+      --caret-icon: var(--caret-icon-dark);
     }
 
     @media (prefers-color-scheme: dark) {
       html:not([data-theme]) & {
-        background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23fff'/%3E%3C/svg%3E");
+        --caret-icon: var(--caret-icon-dark);
       }
     }
 
diff --git a/app/assets/stylesheets/theme-switcher.css b/app/assets/stylesheets/theme-switcher.css
index 2b35308d1..8f25c31f9 100644
--- a/app/assets/stylesheets/theme-switcher.css
+++ b/app/assets/stylesheets/theme-switcher.css
@@ -1,9 +1,12 @@
 @layer components {
   .theme-switcher {
-    @media (max-width: 639px) {
+    @media (max-width: 479px) {
+      --row-gap: 1ch;
+
       flex-direction: column;
     }
   }
+
   .theme-switcher__btn {
     --btn-background: var(--color-ink-lightest);
     --btn-border-radius: 0.4em;
@@ -11,7 +14,7 @@
     --btn-gap: 0.3lh;
     --icon-size: 2em;
 
-    flex: 1 0 33%;
+    flex: 1;
     flex-direction: column;
     position: relative;
     white-space: nowrap;
@@ -25,5 +28,9 @@
         }
       }
     }
+
+    @media (max-width: 479px) {
+      flex-direction: row;
+    }
   }
 }