diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4b0eb63..a870f5d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -130,10 +130,12 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button">Pair right ear</string>
     <!-- Connected devices settings. Positive button of the dialog to help user to pair left ear of the hearing aid device. Dialog shows when only one of the hearing aid device set is connected. [CHAR LIMIT=20] -->
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button">Pair left ear</string>
-    <!-- Connected devices settings. Title of the preference to show the entrance of the hearing device controls page. [CHAR LIMIT=35] -->
-    <string name="bluetooth_device_controls_title">Hearing device controls</string>
-    <!-- Connected devices settings. Summary of the preference to show the entrance of the hearing device controls page. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_device_controls_summary">Hearing device shortcut, hearing aid compatibility</string>
+    <!-- Title for all hearing devices related controls section. [CHAR LIMIT=60] -->
+    <string name="bluetooth_device_controls_general">For all available hearing devices</string>
+    <!-- Connected devices settings. Title of the preference to show the entrance of the hearing device controls related page. [CHAR LIMIT=65] -->
+    <string name="bluetooth_device_controls_title">Shortcuts &amp; hearing aid compatibility</string>
+    <!-- Title for this device specific controls section. [CHAR LIMIT=30] -->
+    <string name="bluetooth_device_controls_specific">For this device</string>
     <!-- Connected devices settings. Title of the preference to show the entrance of the audio output page. It can change different types of audio are played on phone or other bluetooth devices. [CHAR LIMIT=35] -->
     <string name="bluetooth_audio_routing_title">Audio output</string>
     <!-- Title for bluetooth audio routing page footer. [CHAR LIMIT=30] -->
diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml
index 23f026b..ddc1d17 100644
--- a/res/xml/bluetooth_device_details_fragment.xml
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -71,7 +71,12 @@
         android:key="device_companion_apps"/>
 
     <PreferenceCategory
-        android:key="feature_controls_group"/>
+        android:key="device_controls_general"
+        android:title="@string/bluetooth_device_controls_general"/>
+
+    <PreferenceCategory
+        android:key="device_controls_specific"
+        android:title="@string/bluetooth_device_controls_specific"/>
 
     <PreferenceCategory
         android:key="spatial_audio_group"/>
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingController.java b/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingController.java
index 4e40323..91221a3 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingController.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.bluetooth;
 
-import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.FEATURE_AUDIO_ROUTING_ORDER;
 import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS;
 
 import android.content.Context;
@@ -38,7 +37,7 @@
  */
 public class BluetoothDetailsAudioRoutingController extends BluetoothDetailsController  {
 
-    private static final String KEY_FEATURE_CONTROLS_GROUP = "feature_controls_group";
+    private static final String KEY_DEVICE_CONTROLS_SPECIFIC_GROUP = "device_controls_specific";
     @VisibleForTesting
     static final String KEY_AUDIO_ROUTING = "audio_routing";
 
@@ -61,7 +60,6 @@
 
         final PreferenceCategory prefCategory = screen.findPreference(getPreferenceKey());
         final Preference pref = createAudioRoutingPreference(prefCategory.getContext());
-        pref.setOrder(FEATURE_AUDIO_ROUTING_ORDER);
         prefCategory.addPreference(pref);
     }
 
@@ -70,7 +68,7 @@
 
     @Override
     public String getPreferenceKey() {
-        return KEY_FEATURE_CONTROLS_GROUP;
+        return KEY_DEVICE_CONTROLS_SPECIFIC_GROUP;
     }
 
     private Preference createAudioRoutingPreference(Context context) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java
index 6425814..a3b1105 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControlsController.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.bluetooth;
 
-import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.FEATURE_HEARING_DEVICE_CONTROLS_ORDER;
-
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
@@ -41,7 +39,7 @@
 public class BluetoothDetailsHearingDeviceControlsController extends BluetoothDetailsController
         implements Preference.OnPreferenceClickListener {
 
-    private static final String KEY_FEATURE_CONTROLS_GROUP = "feature_controls_group";
+    private static final String KEY_DEVICE_CONTROLS_GENERAL_GROUP = "device_controls_general";
     @VisibleForTesting
     static final String KEY_HEARING_DEVICE_CONTROLS = "hearing_device_controls";
 
@@ -65,7 +63,6 @@
 
         final PreferenceCategory prefCategory = screen.findPreference(getPreferenceKey());
         final Preference pref = createHearingDeviceControlsPreference(prefCategory.getContext());
-        pref.setOrder(FEATURE_HEARING_DEVICE_CONTROLS_ORDER);
         prefCategory.addPreference(pref);
     }
 
@@ -74,7 +71,7 @@
 
     @Override
     public String getPreferenceKey() {
-        return KEY_FEATURE_CONTROLS_GROUP;
+        return KEY_DEVICE_CONTROLS_GENERAL_GROUP;
     }
 
     @Override
@@ -90,7 +87,6 @@
         final Preference preference = new Preference(context);
         preference.setKey(KEY_HEARING_DEVICE_CONTROLS);
         preference.setTitle(context.getString(R.string.bluetooth_device_controls_title));
-        preference.setSummary(context.getString(R.string.bluetooth_device_controls_summary));
         preference.setOnPreferenceClickListener(this);
 
         return preference;
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index b4bb0ff..3851753 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -63,9 +63,6 @@
     public static final String KEY_DEVICE_ADDRESS = "device_address";
     private static final String TAG = "BTDeviceDetailsFrg";
 
-    static final int FEATURE_HEARING_DEVICE_CONTROLS_ORDER = 1;
-    static final int FEATURE_AUDIO_ROUTING_ORDER = 2;
-
     @VisibleForTesting
     static int EDIT_DEVICE_NAME_ITEM_ID = Menu.FIRST;