diff --git a/res/layout/pref_dialog_editphonenumber.xml b/res/layout/pref_dialog_editphonenumber.xml
index b1d96f8..cb16516 100644
--- a/res/layout/pref_dialog_editphonenumber.xml
+++ b/res/layout/pref_dialog_editphonenumber.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="5dip"
-    android:orientation="vertical">
-    
+    android:orientation="vertical"
+    android:padding="?android:attr/dialogPreferredPadding">
+
     <TextView android:id="@+android:id/message"
         style="?android:attr/textAppearanceMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorPrimary"
-        android:paddingStart="10dip"
-        android:paddingEnd="10dip"/>
-        
+        android:textColor="?android:attr/textColorPrimary" />
+
     <LinearLayout
         android:id="@+id/number_field"
         android:layout_width="match_parent"
@@ -36,12 +34,10 @@
         android:layout_weight="1.0"
         android:addStatesFromChildren="true"
         android:gravity="center_vertical"
-        android:baselineAligned="false"
-        android:paddingStart="10dip"
-        android:paddingEnd="10dip">
+        android:baselineAligned="false">
 
         <!-- The EditText field in the dialog is now created programmatically.
-             We're replacing the field in this layout with a container to 
+             We're replacing the field in this layout with a container to
              attach the EditText field. -->
         <LinearLayout android:id="@+id/edit_container"
             android:layout_width="0dip"
@@ -54,6 +50,7 @@
             android:padding="10dip"
             android:src="@drawable/ic_see_contacts_holo_dark"
             android:contentDescription="@string/selectContact" />
+
     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/pref_dialog_editpin.xml b/res/layout/pref_dialog_editpin.xml
index a5376a8..a278690 100644
--- a/res/layout/pref_dialog_editpin.xml
+++ b/res/layout/pref_dialog_editpin.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,13 +19,13 @@
     android:id="@*android:id/edittext_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="5dip"
-    android:orientation="vertical">
-    
+    android:orientation="vertical"
+    android:padding="?android:attr/dialogPreferredPadding">
+
     <TextView android:id="@+android:id/message"
         style="?android:attr/textAppearanceSmall"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="?android:attr/textColorSecondary" />
-        
+
 </LinearLayout>