diff --git a/res/layout/profile_owner_add.xml b/res/layout/profile_owner_add.xml
index 84c51fd8316..2ee5dfce740 100644
--- a/res/layout/profile_owner_add.xml
+++ b/res/layout/profile_owner_add.xml
@@ -27,12 +27,17 @@
               android:layout_height="0dp"
               android:layout_weight="1"
               android:scrollbars = "vertical"
-              android:padding="?dialogPreferredPadding"
+              android:paddingStart="24dp"
+              android:paddingEnd="24dp"
+              android:paddingTop="12dp"
+              android:paddingBottom="6dp"
               android:gravity="center_vertical"/>
 
     <TextView android:id="@+id/admin_warning_simplified"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:paddingStart="?dialogPreferredPadding"
-              android:paddingEnd="?dialogPreferredPadding"/>
+              android:paddingStart="24dp"
+              android:paddingEnd="24dp"
+              android:paddingTop="6dp"
+              android:paddingBottom="12dp"/>
 </LinearLayout>
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 0d0bd2016c5..8b06975bc06 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -312,7 +312,7 @@ public class DeviceAdminAdd extends Activity {
                             addAndFinish();
                         }
                     })
-                    .setNeutralButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                     .setOnDismissListener(new DialogInterface.OnDismissListener() {
                         public void onDismiss(DialogInterface dialogInterface) {
                             finish();