diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt b/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
index 8888f0dacf5..94a1168dbb7 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
@@ -25,8 +25,6 @@ import android.os.Looper
 import android.os.Process
 import android.os.SimpleClock
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -34,7 +32,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringArrayResource
@@ -44,14 +41,13 @@ import androidx.navigation.navArgument
 import com.android.settings.R
 import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
 import com.android.settingslib.spa.framework.common.SettingsPageProvider
-import com.android.settingslib.spa.framework.theme.SettingsDimension
 import com.android.settingslib.spa.widget.preference.ListPreferenceModel
 import com.android.settingslib.spa.widget.preference.ListPreferenceOption
 import com.android.settingslib.spa.widget.preference.RadioPreferences
 import com.android.settingslib.spa.widget.preference.SwitchPreference
 import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
 import com.android.settingslib.spa.widget.scaffold.RegularScaffold
-import com.android.settingslib.spa.widget.ui.CategoryTitle
+import com.android.settingslib.spa.widget.ui.Category
 import com.android.wifitrackerlib.WifiEntry
 import java.time.Clock
 import java.time.ZoneOffset
@@ -123,34 +119,34 @@ fun WifiPrivacyPage(wifiEntry: WifiEntry) {
 
 @Composable
 fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) {
-    Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
-    CategoryTitle(title = stringResource(R.string.wifi_privacy_device_name_settings))
-    Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
-    var checked by remember {
-        mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled)
-    }
-    val context = LocalContext.current
-    val wifiManager = context.getSystemService(WifiManager::class.java)!!
-    SwitchPreference(object : SwitchPreferenceModel {
-        override val title =
-            context.resources.getString(
-                R.string.wifi_privacy_send_device_name_toggle_title
-            )
-        override val summary =
-            {
-                context.resources.getString(
-                    R.string.wifi_privacy_send_device_name_toggle_summary
-                )
-            }
-        override val checked = { checked }
-        override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
-            wifiEntry.wifiConfiguration?.let {
-                it.isSendDhcpHostnameEnabled = newChecked
-                wifiManager.save(it, null /* listener */)
-                checked = newChecked
-            }
+    val title = stringResource(id = R.string.wifi_privacy_device_name_settings)
+    Category(title = title) {
+        var checked by remember {
+            mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled)
         }
-    })
+        val context = LocalContext.current
+        val wifiManager = context.getSystemService(WifiManager::class.java)!!
+        SwitchPreference(object : SwitchPreferenceModel {
+            override val title =
+                context.resources.getString(
+                    R.string.wifi_privacy_send_device_name_toggle_title
+                )
+            override val summary =
+                {
+                    context.resources.getString(
+                        R.string.wifi_privacy_send_device_name_toggle_summary
+                    )
+                }
+            override val checked = { checked }
+            override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
+                wifiEntry.wifiConfiguration?.let {
+                    it.isSendDhcpHostnameEnabled = newChecked
+                    wifiManager.save(it, null /* listener */)
+                    checked = newChecked
+                }
+            }
+        })
+    }
 }
 
 fun onSelectedChange(wifiEntry: WifiEntry, privacy: Int) {