diff --git a/res/values/strings.xml b/res/values/strings.xml
index edabf61a806..a1d5ac06445 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11484,19 +11484,22 @@
     <string name="emergency_gesture_screen_title">Emergency SOS</string>
 
     <!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
-    <string name="emergency_gesture_switchbar_title">Use emergency SOS</string>
+    <string name="emergency_gesture_switchbar_title">Use Emergency SOS</string>
 
     <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
     <string name="emergency_gesture_entrypoint_summary">Managed by <xliff:g id="app_name" example="Emergency Info">%1$s</xliff:g></string>
 
     <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
-    <string name="emergency_gesture_screen_summary">Start the actions below by pressing the power button quickly 5 times or more</string>
+    <string name="emergency_gesture_screen_summary">Press the Power button quickly 5 times or more to start the actions below</string>
 
     <!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
     <string name="emergency_gesture_sound_setting_title">Play countdown alarm</string>
 
     <!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
-    <string name="emergency_gesture_sound_setting_summary">Play a loud sound before notifying for help</string>
+    <string name="emergency_gesture_sound_setting_summary">Play a loud sound when Emergency SOS is starting</string>
+
+    <!-- Preference category title listing a phone number to call during emergency gesture [CHAR_LIMIT=60]-->
+    <string name="emergency_gesture_category_call_for_help_title">Notify for help</string>
 
     <!-- Preference title listing a phone number to call during emergency gesture [CHAR_LIMIT=60]-->
     <string name="emergency_gesture_call_for_help_title">Call for help</string>
@@ -11510,7 +11513,7 @@
     <!-- Notes explaining limitations for emergency gesture number override [CHAR_LIMIT=NONE]-->
     <string name="emergency_gesture_number_override_notes">
         If you enter a non-emergency number:\n
-        • Your device must be unlocked to use emergency SOS\n
+        • Your device must be unlocked to use Emergency SOS\n
         • Your call may not be answered
     </string>
 
diff --git a/res/xml/emergency_gesture_settings.xml b/res/xml/emergency_gesture_settings.xml
index 22e51a9e268..9fd644ff233 100644
--- a/res/xml/emergency_gesture_settings.xml
+++ b/res/xml/emergency_gesture_settings.xml
@@ -22,12 +22,11 @@
 
     <com.android.settingslib.widget.MainSwitchPreference
         android:key="gesture_emergency_button_switch_bar"
-        app:controller="com.android.settings.emergency.EmergencyGesturePreferenceController" />
+        app:controller="com.android.settings.emergency.EmergencyGesturePreferenceController"/>
 
     <com.android.settingslib.widget.TopIntroPreference
         android:title="@string/emergency_gesture_screen_summary"
-        app:allowDividerAbove="false"
-        app:allowDividerBelow="true" />
+        app:allowDividerAbove="false"/>
 
     <SwitchPreference
         android:key="emergency_gesture_sound"
@@ -35,17 +34,18 @@
         android:title="@string/emergency_gesture_sound_setting_title"
         android:summary="@string/emergency_gesture_sound_setting_summary"
         app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.emergency.EmergencyGestureSoundPreferenceController"
-        app:allowDividerAbove="true"/>
-
-    <com.android.settings.emergency.EmergencyGestureNumberOverridePreference
-        android:key="emregency_gesture_number_override"
-        android:title="@string/emergency_gesture_call_for_help_title"
-        android:summary="@string/summary_placeholder"
-        android:icon="@drawable/ic_call_grey_24dp"
-        android:dialogTitle="@string/emergency_gesture_call_for_help_dialog_title"
-        android:dialogLayout="@layout/emergency_gesture_number_override_dialog"
-        android:positiveButtonText="@string/save"
-        app:allowDividerAbove="true"
-        app:controller="com.android.settings.emergency.EmergencyGestureNumberOverridePreferenceController"/>
+        app:controller="com.android.settings.emergency.EmergencyGestureSoundPreferenceController"/>
+    <PreferenceCategory
+        android:key="emergency_gesture_notify_for_help"
+        android:title="@string/emergency_gesture_category_call_for_help_title">
+        <com.android.settings.emergency.EmergencyGestureNumberOverridePreference
+            android:key="emregency_gesture_number_override"
+            android:title="@string/emergency_gesture_call_for_help_title"
+            android:summary="@string/summary_placeholder"
+            android:icon="@drawable/ic_call_grey_24dp"
+            android:dialogTitle="@string/emergency_gesture_call_for_help_dialog_title"
+            android:dialogLayout="@layout/emergency_gesture_number_override_dialog"
+            android:positiveButtonText="@string/save"
+            app:controller="com.android.settings.emergency.EmergencyGestureNumberOverridePreferenceController"/>
+    </PreferenceCategory>
 </PreferenceScreen>