diff --git a/dist/index.js b/dist/index.js
index 2ee3557d..9ac10486 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -5611,7 +5611,7 @@
       this.connectionModel = connectionModel2;
       this.chatListModel = chatListModel2;
       this.fileTransferModel = fileTransferModel2;
-      this.BUILD = "Build 26.04.09.B";
+      this.BUILD = "Build 26.04.09.C";
       // DRAG & DROP
       this.draggedObject = new State(void 0);
       // SUGGESTIONS
@@ -6842,7 +6842,7 @@
         ),
         detailView,
         new State(""),
-        false,
+        true,
         settingsViewModel2.selectedModalPage
       )), /* @__PURE__ */ createElement("button", { "on:click": settingsViewModel2.hideSettingsModal }, coreViewModel2.translations.general.closeButton, /* @__PURE__ */ createElement("span", { class: "icon" }, "close")))
     );
@@ -6884,19 +6884,21 @@
     )));
   }
   function SettingsRegionalPane(coreViewModel2, settingsViewModel2) {
-    return /* @__PURE__ */ createElement("div", { class: "slide-up" }, /* @__PURE__ */ createElement("h2", null, coreViewModel2.translations.settings.pages.regional), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("label", { class: "tile flex-no" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "calendar_month"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, coreViewModel2.translations.settings.firstDayOfWeekLabel), /* @__PURE__ */ createElement("select", { "bind:value": settingsViewModel2.firstDayOfWeek }, ...coreViewModel2.translations.regional.weekdays.full.map(
-      (weekdayName, i) => Option(
-        weekdayName,
-        i.toString(),
-        i.toString() == settingsViewModel2.firstDayOfWeek.value
-      )
-    )), /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_drop_down"))), /* @__PURE__ */ createElement("label", { class: "tile flex-no" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "language"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, coreViewModel2.translations.settings.language), /* @__PURE__ */ createElement("select", { "bind:value": settingsViewModel2.language }, ...[...Object.values(Languages)].map(
-      (language, i) => Option(
-        languageNames[language],
-        language,
-        language == settingsViewModel2.language.value
-      )
-    )), /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_drop_down"))));
+    return /* @__PURE__ */ createElement("div", { class: "slide-up" }, /* @__PURE__ */ createElement("h2", null, coreViewModel2.translations.settings.pages.regional), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("h3", null, coreViewModel2.translations.settings.language), OptionButtonList(
+      new ListState(
+        Object.values(Languages).map(
+          (x) => [languageNames[x], x]
+        )
+      ),
+      settingsViewModel2.language
+    ), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("h3", null, coreViewModel2.translations.settings.firstDayOfWeekLabel), OptionButtonList(
+      new ListState(
+        coreViewModel2.translations.regional.weekdays.full.map(
+          (x, i) => [x, i.toString()]
+        )
+      ),
+      settingsViewModel2.firstDayOfWeek
+    ));
   }
   function SettingsAppearancePane(coreViewModel2, settingsViewModel2) {
     return /* @__PURE__ */ createElement("div", { class: "slide-up" }, /* @__PURE__ */ createElement("h2", null, coreViewModel2.translations.settings.pages.appearance), /* @__PURE__ */ createElement("hr", null), OptionButtonList(
diff --git a/src/View/Modals/settingsModal.tsx b/src/View/Modals/settingsModal.tsx
index e2de34d3..dc811770 100644
--- a/src/View/Modals/settingsModal.tsx
+++ b/src/View/Modals/settingsModal.tsx
@@ -49,7 +49,7 @@ export function SettingsModal(
                         ),
                         detailView,
                         new React.State(""),
-                        false,
+                        true,
                         settingsViewModel.selectedModalPage,
                     )}
                 </main>
@@ -133,46 +133,28 @@ function SettingsRegionalPane(
     return (
         <div class="slide-up">
             <h2>{coreViewModel.translations.settings.pages.regional}</h2>
+
             <hr></hr>
-            <label class="tile flex-no">
-                <span class="icon">calendar_month</span>
-                <div>
-                    <span>
-                        {
-                            coreViewModel.translations.settings
-                                .firstDayOfWeekLabel
-                        }
-                    </span>
-                    <select bind:value={settingsViewModel.firstDayOfWeek}>
-                        {...coreViewModel.translations.regional.weekdays.full.map(
-                            (weekdayName, i) =>
-                                Option(
-                                    weekdayName,
-                                    i.toString(),
-                                    i.toString() ==
-                                        settingsViewModel.firstDayOfWeek.value,
-                                ),
-                        )}
-                    </select>
-                    <span class="icon">arrow_drop_down</span>
-                </div>
-            </label>
-            <label class="tile flex-no">
-                <span class="icon">language</span>
-                <div>
-                    <span>{coreViewModel.translations.settings.language}</span>
-                    <select bind:value={settingsViewModel.language}>
-                        {...[...Object.values(Languages)].map((language, i) =>
-                            Option(
-                                languageNames[language],
-                                language,
-                                language == settingsViewModel.language.value,
-                            ),
-                        )}
-                    </select>
-                    <span class="icon">arrow_drop_down</span>
-                </div>
-            </label>
+            <h3>{coreViewModel.translations.settings.language}</h3>
+            {OptionButtonList(
+                new React.ListState<[string, string]>(
+                    Object.values(Languages).map(
+                        (x) => [languageNames[x], x],
+                    ),
+                ),
+                settingsViewModel.language,
+            )}
+
+            <hr></hr>
+            <h3>{coreViewModel.translations.settings.firstDayOfWeekLabel}</h3>
+            {OptionButtonList(
+                new React.ListState<[string, string]>(
+                    coreViewModel.translations.regional.weekdays.full.map(
+                        (x, i) => [x, i.toString()],
+                    ),
+                ),
+                settingsViewModel.firstDayOfWeek,
+            )}
         </div>
     );
 }
diff --git a/src/ViewModel/Global/coreViewModel.ts b/src/ViewModel/Global/coreViewModel.ts
index edac8848..835b1d6e 100644
--- a/src/ViewModel/Global/coreViewModel.ts
+++ b/src/ViewModel/Global/coreViewModel.ts
@@ -7,7 +7,7 @@ import ChatListModel from "../../Model/Chat/chatListModel";
 import FileTransferModel from "../../Model/Global/fileTransferModel";
 
 export default class CoreViewModel {
-    readonly BUILD = "Build 26.04.09.C";
+    readonly BUILD = "Build 26.04.09.D";
 
     translations: Translations;
 
diff --git a/src/colors.css b/src/colors.css
index 2dc6c042..a813a001 100644
--- a/src/colors.css
+++ b/src/colors.css
@@ -60,7 +60,6 @@ body[theme="dark"] [color]:not([color="standard"]).tile {
     --surface-active: hsl(var(--hue), 100%, var(--active-luma));
 
     --text-normal: hsl(var(--hue), 100%, var(--text-luma));
-
 }
 
 /* fill */