diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index b42b694de03..a15a9624813 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -25,8 +25,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
-        android:paddingStart="16dip"
-        android:paddingEnd="16dip"
         android:scrollbarStyle="outsideOverlay"
         android:gravity="top">
         <LinearLayout
@@ -37,6 +35,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingStart="16dip"
+                android:paddingEnd="16dip"
                 android:orientation="horizontal"
                 android:layout_marginTop="16dip">
 
@@ -63,6 +63,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingStart="16dip"
+                android:paddingEnd="16dip"
                 android:orientation="vertical">
 
                 <TextView android:id="@+id/profile_owner_warning"
@@ -120,58 +122,42 @@
                     android:padding="10dip" />
             </LinearLayout>
 
+            <LinearLayout android:id="@+id/buttonPanel"
+                style="?android:attr/buttonBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:divider="?android:attr/dividerHorizontal"
+                android:showDividers="beginning|middle|end">
+                <Button android:id="@+id/action_button"
+                    android:layout_width="match_parent"
+                    android:layout_gravity="start"
+                    android:gravity="left|center_vertical"
+                    android:maxLines="2"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:textAllCaps="false"
+                    android:layout_height="wrap_content" />
+                <Button android:id="@+id/cancel_button"
+                    android:layout_width="match_parent"
+                    android:layout_gravity="end"
+                    android:gravity="left|center_vertical"
+                    android:maxLines="2"
+                    android:text="@string/cancel"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:textAllCaps="false"
+                    android:layout_height="wrap_content" />
+                <Button android:id="@+id/uninstall_button"
+                    android:layout_width="match_parent"
+                    android:layout_gravity="end"
+                    android:gravity="left|center_vertical"
+                    android:maxLines="2"
+                    android:text="@string/uninstall_device_admin"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:textAllCaps="false"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+            </LinearLayout>
+
         </LinearLayout>
     </ScrollView>
-
-    <LinearLayout android:id="@+id/buttonPanel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:divider="?android:attr/dividerHorizontal"
-        android:showDividers="beginning">
-        <LinearLayout
-            style="?android:attr/buttonBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:measureWithLargestChild="true">
-            <LinearLayout android:id="@+id/leftSpacer"
-                android:layout_weight="0.25"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone" />
-            <Button android:id="@+id/cancel_button"
-                android:layout_width="0dip"
-                android:layout_gravity="end"
-                android:layout_weight="1"
-                android:maxLines="2"
-                android:text="@string/cancel"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_height="wrap_content" />
-            <Button android:id="@+id/uninstall_button"
-                android:layout_width="0dip"
-                android:layout_gravity="end"
-                android:layout_weight="1"
-                android:maxLines="2"
-                android:text="@string/uninstall_device_admin"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-            <Button android:id="@+id/action_button"
-                android:layout_width="0dip"
-                android:layout_gravity="start"
-                android:layout_weight="1"
-                android:maxLines="2"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_height="wrap_content" />
-            <LinearLayout android:id="@+id/rightSpacer"
-                android:layout_width="0dip"
-                android:layout_weight="0.25"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone" />
-        </LinearLayout>
-     </LinearLayout>
-
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b6e35a8aab..0e7ca629610 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4583,10 +4583,10 @@
     <string name="device_admin_settings_title">Device administration settings</string>
     <!-- Label for screen showing the active device policy -->
     <string name="active_device_admin_msg">Device administrator</string>
-    <!-- Label for button to remove the active device admin -->
-    <string name="remove_device_admin">Deactivate</string>
-    <!-- Label for button to uninstall the device admin application [CHAR LIMIT=40] -->
-    <string name="uninstall_device_admin">Uninstall</string>
+    <!-- Label for button to remove the active device admin [CHAR LIMIT=80] -->
+    <string name="remove_device_admin">Deactivate this device administrator</string>
+    <!-- Label for button to uninstall the device admin application [CHAR LIMIT=80] -->
+    <string name="uninstall_device_admin">Uninstall app</string>
     <!-- Label for button to deactivate and uninstall the device admin [CHAR_LIMIT=50]-->
     <string name="remove_and_uninstall_device_admin">Deactivate and Uninstall</string>
     <!-- Label for screen showing to select device policy -->
@@ -4604,8 +4604,8 @@
 
     <!-- Label for screen showing to add device policy -->
     <string name="add_device_admin_msg">Activate device administrator?</string>
-    <!-- Label for button to set the active device admin -->
-    <string name="add_device_admin">Activate</string>
+    <!-- Label for button to set the active device admin [CHAR_LIMIT=80] -->
+    <string name="add_device_admin">Activate this device administrator</string>
     <!-- Device admin add activity title -->
     <string name="device_admin_add_title">Device administrator</string>
     <!-- Device admin warning message about policies an admin can use -->