diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 9772fa2bd65..735b3b7d986 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -27,55 +27,57 @@
         android:key="media_volume"
         android:icon="@*android:drawable/ic_audio_media"
         android:title="@string/media_volume_option_title"
-        settings:controller="com.android.settings.notification.MediaVolumePreferenceController"
-        android:order="-170"/>
-
-    <!-- Alarm volume -->
-    <com.android.settings.notification.VolumeSeekBarPreference
-        android:key="alarm_volume"
-        android:icon="@*android:drawable/ic_audio_alarm"
-        android:title="@string/alarm_volume_option_title"
-        settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"
-        android:order="-160"/>
+        android:order="-180"
+        settings:controller="com.android.settings.notification.MediaVolumePreferenceController"/>
 
     <!-- Ring volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
         android:key="ring_volume"
         android:icon="@*android:drawable/ic_audio_ring_notif"
         android:title="@string/ring_volume_option_title"
+        android:order="-170"
         settings:controller="com.android.settings.notification.RingVolumePreferenceController"
-        android:order="-150"/>
+        settings:allowDividerAbove="true"/>
+
+    <!-- Also vibrate for calls -->
+    <SwitchPreference
+        android:key="vibrate_when_ringing"
+        android:title="@string/vibrate_when_ringing_title"
+        android:order="-160"/>
+
+    <!-- Alarm volume -->
+    <com.android.settings.notification.VolumeSeekBarPreference
+        android:key="alarm_volume"
+        android:icon="@*android:drawable/ic_audio_alarm"
+        android:title="@string/alarm_volume_option_title"
+        android:order="-150"
+        settings:allowDividerAbove="true"
+        settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>
 
     <!-- Notification volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
         android:key="notification_volume"
         android:icon="@*android:drawable/ic_audio_ring_notif"
         android:title="@string/notification_volume_option_title"
-        settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"
-        android:order="-140"/>
-
-    <!-- Also vibrate for calls -->
-    <SwitchPreference
-        android:key="vibrate_when_ringing"
-        android:title="@string/vibrate_when_ringing_title"
-        android:order="-130"/>
+        android:order="-140"
+        settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"/>
 
     <!-- Interruptions -->
     <com.android.settingslib.RestrictedPreference
         android:key="zen_mode"
         android:title="@string/zen_mode_settings_title"
+        android:fragment="com.android.settings.notification.ZenModeSettings"
+        android:order="-120"
         settings:useAdminDisabledSummary="true"
         settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
-        android:fragment="com.android.settings.notification.ZenModeSettings"
-        settings:allowDividerAbove="true"
-        android:order="-120"/>
+        settings:allowDividerAbove="true"/>
 
     <Preference
         android:key="gesture_prevent_ringing_sound"
         android:title="@string/gesture_prevent_ringing_sound_title"
-        settings:allowDividerAbove="true"
         android:order="-110"
         android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
+        settings:allowDividerAbove="true"
         settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />
 
     <!-- Phone ringtone -->
@@ -85,8 +87,8 @@
         android:dialogTitle="@string/ringtone_title"
         android:summary="@string/summary_placeholder"
         android:ringtoneType="ringtone"
-        settings:allowDividerAbove="true"
-        android:order="-100"/>
+        android:order="-100"
+        settings:allowDividerAbove="true"/>
 
     <!-- Default notification ringtone -->
     <com.android.settings.DefaultRingtonePreference