diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
index e83071e5..17ece7b5 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
@@ -39,7 +39,6 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Parcelable;
-import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import timber.log.Timber;
 import android.util.TypedValue;
@@ -49,6 +48,7 @@ import android.widget.RemoteViews;
 import android.widget.Toast;
 
 import androidx.annotation.ColorInt;
+import androidx.preference.PreferenceManager;
 
 import org.moire.ultrasonic.R;
 import org.moire.ultrasonic.activity.NavigationActivity;
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
index 193f6811..f12b2bd7 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
@@ -6,7 +6,6 @@ import android.content.Intent
 import android.content.res.Resources
 import android.media.AudioManager
 import android.os.Bundle
-import android.preference.PreferenceManager
 import android.provider.MediaStore
 import android.provider.SearchRecentSuggestions
 import android.view.KeyEvent
@@ -26,6 +25,7 @@ import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.onNavDestinationSelected
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import androidx.preference.PreferenceManager
 import com.google.android.material.navigation.NavigationView
 import org.koin.android.ext.android.inject
 import org.koin.android.viewmodel.ext.android.viewModel
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSettingsModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSettingsModel.kt
index 8db8570b..dc5ad667 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSettingsModel.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSettingsModel.kt
@@ -2,10 +2,10 @@ package org.moire.ultrasonic.fragment
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.preference.PreferenceManager
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.preference.PreferenceManager
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.moire.ultrasonic.data.ActiveServerProvider