diff --git a/android_app/app/src/main/res/layout/fragment_usersettings.xml b/android_app/app/src/main/res/layout/fragment_usersettings.xml
index 2c22a7150..621ae6140 100644
--- a/android_app/app/src/main/res/layout/fragment_usersettings.xml
+++ b/android_app/app/src/main/res/layout/fragment_usersettings.xml
@@ -98,12 +98,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:checked="true"
+                        android:theme="@style/AppTheme.RadioButton"
                         android:text="@string/label_male" />
 
                     <RadioButton
                         android:id="@+id/btnRadioWoman"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:theme="@style/AppTheme.RadioButton"
                         android:text="@string/label_female" />
                 </RadioGroup>
             </TableRow>
@@ -184,11 +186,13 @@
                         android:layout_height="wrap_content"
                         android:text="cm"
                         android:id="@+id/btnRadioCM"
+                        android:theme="@style/AppTheme.RadioButton"
                         android:checked="true" />
 
                     <RadioButton
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:theme="@style/AppTheme.RadioButton"
                         android:text="in"
                         android:id="@+id/btnRadioINCH" />
                 </RadioGroup>
@@ -216,18 +220,21 @@
                         android:layout_height="wrap_content"
                         android:text="kg"
                         android:id="@+id/btnRadioKG"
+                        android:theme="@style/AppTheme.RadioButton"
                         android:checked="true" />
 
                     <RadioButton
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="lb"
+                        android:theme="@style/AppTheme.RadioButton"
                         android:id="@+id/btnRadioLB" />
 
                     <RadioButton
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="st"
+                        android:theme="@style/AppTheme.RadioButton"
                         android:id="@+id/btnRadioST" />
                 </RadioGroup>
             </TableRow>
diff --git a/android_app/app/src/main/res/layout/user_preference_widget_layout.xml b/android_app/app/src/main/res/layout/user_preference_widget_layout.xml
index e446a76b3..76389c16e 100644
--- a/android_app/app/src/main/res/layout/user_preference_widget_layout.xml
+++ b/android_app/app/src/main/res/layout/user_preference_widget_layout.xml
@@ -13,6 +13,7 @@
         android:id="@+id/user_radio_button"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.RadioButton"
         android:layout_marginLeft="16dp"
         android:layout_weight="1" />
 </LinearLayout>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values-night/themes.xml b/android_app/app/src/main/res/values-night/themes.xml
index cde54ccad..de500ef83 100644
--- a/android_app/app/src/main/res/values-night/themes.xml
+++ b/android_app/app/src/main/res/values-night/themes.xml
@@ -27,6 +27,16 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
+        <item name="colorAccent">@color/md_theme_dark_onPrimary</item>
+    </style>
+
+    <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
+        <item name="colorPrimary">@color/md_theme_dark_onBackground</item>
+    </style>
+
+    <style name="AppTheme.RadioButton" parent="Widget.Material3.CompoundButton.RadioButton">
+        <item name="colorPrimary">@color/md_theme_dark_onPrimary</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
diff --git a/android_app/app/src/main/res/values/themes.xml b/android_app/app/src/main/res/values/themes.xml
index 8ab6c7092..f8c3b75c7 100644
--- a/android_app/app/src/main/res/values/themes.xml
+++ b/android_app/app/src/main/res/values/themes.xml
@@ -27,6 +27,7 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
+        <item name="colorAccent">@color/md_theme_light_primary</item>
     </style>
 
     <style name="AppTheme.NoActionBar">