diff --git a/res/layout/more_settings_button.xml b/res/layout/more_settings_button.xml
index 4bbe1191108..84ef75a519e 100644
--- a/res/layout/more_settings_button.xml
+++ b/res/layout/more_settings_button.xml
@@ -14,22 +14,20 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<LinearLayout
+<FrameLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:settings="http://schemas.android.com/apk/res-auto"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
+      android:layout_height="wrap_content">
 
       <Button
          android:id="@+id/button"
+         style="@style/ActionPrimaryButton"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
-         android:layout_gravity="center_horizontal"
-         android:layout_marginTop="20dip"
-         android:layout_marginBottom="20dip"
-         style="@style/ActionPrimaryButton"
-         settings:allowDividerBelow="true"
-         android:gravity="center" />
+         android:layout_marginVertical="8dp"
+         android:layout_marginHorizontal="16dp"
+         android:theme="@style/RoundedCornerThemeOverlay"
+         settings:allowDividerBelow="true"/>
 
-</LinearLayout>
+</FrameLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8ca72db463f..078c6b6b37a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -421,6 +421,10 @@
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
 
+    <style name="RoundedCornerThemeOverlay">
+        <item name="android:buttonCornerRadius">24dp</item>
+    </style>
+
     <style name="LockPatternContainerStyle">
         <item name="android:maxHeight">400dp</item>
         <item name="android:maxWidth">420dp</item>
diff --git a/res/xml/emergency_settings.xml b/res/xml/emergency_settings.xml
index 65041fde170..f8067aa60fd 100644
--- a/res/xml/emergency_settings.xml
+++ b/res/xml/emergency_settings.xml
@@ -20,6 +20,13 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="safety_and_emergency_screen"
     android:title="@string/emergency_settings_preference_title">
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="more_emergency_settings"
+        android:layout="@layout/more_settings_button"
+        android:order="0"
+        android:selectable="false"
+        settings:allowDividerBelow="true"
+        settings:controller="com.android.settings.emergency.MoreSettingsPreferenceController" />
     <Preference
         android:key="gesture_emergency_summary"
         android:title="@string/emergency_gesture_screen_title"
@@ -27,13 +34,6 @@
         android:order="100"
         android:fragment="com.android.settings.emergency.EmergencyGestureSettings"
         settings:controller="com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController" />
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="more_emergency_settings"
-        android:layout="@layout/more_settings_button"
-        android:order="180"
-        android:selectable="false"
-        settings:allowDividerBelow="true"
-        settings:controller="com.android.settings.emergency.MoreSettingsPreferenceController" />
     <com.android.settingslib.RestrictedPreference
         android:key="app_and_notif_cell_broadcast_settings"
         android:title="@string/cell_broadcast_settings"