diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c50dd311..ac613216 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 android {
     namespace = "net.rpcsx"
     compileSdk = 36
-    ndkVersion = "29.0.13113456"
+    ndkVersion = "29.0.14206865"
 
     defaultConfig {
         applicationId = "net.rpcsx"
diff --git a/app/src/main/java/net/rpcsx/ui/settings/components/preference/ListPreference.kt b/app/src/main/java/net/rpcsx/ui/settings/components/preference/ListPreference.kt
index b6298482..41433e63 100644
--- a/app/src/main/java/net/rpcsx/ui/settings/components/preference/ListPreference.kt
+++ b/app/src/main/java/net/rpcsx/ui/settings/components/preference/ListPreference.kt
@@ -43,7 +43,7 @@ fun <T> SingleSelectionDialog(
     values: List<T>,
     title: @Composable () -> Unit,
     modifier: Modifier = Modifier,
-    icon: @Composable () -> Unit = {},
+    icon: @Composable (() -> Unit)? = null,
     currentValue: T? = null,
     enabled: Boolean = true,
     subtitle: @Composable (() -> Unit)? = null,
@@ -126,7 +126,7 @@ fun <T> SingleSelectionDialog(
 ) {
     SingleSelectionDialog(
         title = { PreferenceTitle(title = title) },
-        icon = { PreferenceIcon(icon = icon) },
+        icon = icon?.let { { PreferenceIcon(icon = it) } },
         currentValue = currentValue,
         onValueChange = onValueChange,
         values = values,
diff --git a/app/src/main/java/net/rpcsx/ui/settings/components/preference/RegularPreference.kt b/app/src/main/java/net/rpcsx/ui/settings/components/preference/RegularPreference.kt
index 197bbbf9..58cd729a 100644
--- a/app/src/main/java/net/rpcsx/ui/settings/components/preference/RegularPreference.kt
+++ b/app/src/main/java/net/rpcsx/ui/settings/components/preference/RegularPreference.kt
@@ -25,7 +25,7 @@ import net.rpcsx.ui.settings.components.core.PreferenceTitle
 fun RegularPreference(
     title: @Composable () -> Unit,
     modifier: Modifier = Modifier,
-    leadingIcon: @Composable (() -> Unit) = {},
+    leadingIcon: @Composable (() -> Unit)? = null,
     subtitle: @Composable (() -> Unit)? = null,
     value: @Composable (() -> Unit)? = null,
     trailingContent: @Composable (() -> Unit)? = null,