diff --git a/res/drawable-hdpi/nav_divider.png b/res/drawable-hdpi/nav_divider.png
index 7ca3e6131b0..b1f035c93d9 100644
Binary files a/res/drawable-hdpi/nav_divider.png and b/res/drawable-hdpi/nav_divider.png differ
diff --git a/res/drawable-mdpi/nav_divider.png b/res/drawable-mdpi/nav_divider.png
index c9413d7c147..f7ed6dff8ec 100644
Binary files a/res/drawable-mdpi/nav_divider.png and b/res/drawable-mdpi/nav_divider.png differ
diff --git a/res/layout/account_preference.xml b/res/layout/account_preference.xml
index 810c57a79d0..5e2edc6db3c 100644
--- a/res/layout/account_preference.xml
+++ b/res/layout/account_preference.xml
@@ -14,51 +14,8 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/providerIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="5dip"
-        android:layout_gravity="center" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-    </RelativeLayout>
-
-    <ImageView
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/syncStatusIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="7dip"
         android:layout_gravity="center" />
-
-</LinearLayout>
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index 531bdc341fb..ff1162e16fa 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -17,49 +17,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:gravity="center_vertical">
 
-    <ImageView
-        android:id="@+id/btClass"
+    <LinearLayout android:id="@+id/profileIcons"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="12dip"
-        android:layout_gravity="center_vertical" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <!-- Device name -->
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <!-- Status summary -->
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-        <LinearLayout android:id="@+id/profileIcons"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            />
-    </RelativeLayout>
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        />
 
     <!-- Divider -->
     <ImageView
diff --git a/res/layout/preference_bluetooth_profile.xml b/res/layout/preference_bluetooth_profile.xml
index 5ec0a479f99..03f598a23a0 100644
--- a/res/layout/preference_bluetooth_profile.xml
+++ b/res/layout/preference_bluetooth_profile.xml
@@ -15,51 +15,9 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/profileIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="12dip"
-        android:layout_gravity="center_vertical" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <!-- Device name -->
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <!-- Status summary -->
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-        <LinearLayout android:id="@+id/profileIcons"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            />
-    </RelativeLayout>
+    android:gravity="center_vertical">
 
     <!-- Divider -->
     <ImageView
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java
index a860d1a5d28..dc5633457d2 100644
--- a/src/com/android/settings/AccountPreference.java
+++ b/src/com/android/settings/AccountPreference.java
@@ -49,7 +49,7 @@ public class AccountPreference extends Preference {
         mAccount = account;
         mAuthorities = authorities;
         mProviderIcon = icon;
-        setLayoutResource(R.layout.account_preference);
+        setWidgetLayoutResource(R.layout.account_preference);
         setTitle(mAccount.name);
         setSummary("");
         // Add account info to the intent for AccountSyncSettings
@@ -72,7 +72,7 @@ public class AccountPreference extends Preference {
     protected void onBindView(View view) {
         super.onBindView(view);
         setSummary(getSyncStatusMessage(mStatus));
-        mProviderIconView = (ImageView) view.findViewById(R.id.providerIcon);
+        mProviderIconView = (ImageView) view.findViewById(android.R.id.icon);
         mProviderIconView.setImageDrawable(mProviderIcon);
         mSyncStatusIcon = (ImageView) view.findViewById(R.id.syncStatusIcon);
         mSyncStatusIcon.setImageResource(getSyncStatusIcon(mStatus));
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 1f9408d12e4..b54df089116 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -64,7 +64,7 @@ public class BluetoothDevicePreference extends Preference implements
         mCachedDevice = cachedDevice;
         mAccessibleProfile = accessibleProfile;
 
-        setLayoutResource(R.layout.preference_bluetooth);
+        setWidgetLayoutResource(R.layout.preference_bluetooth);
 
         cachedDevice.registerCallback(this);
 
@@ -127,7 +127,7 @@ public class BluetoothDevicePreference extends Preference implements
 
         super.onBindView(view);
 
-        ImageView btClass = (ImageView) view.findViewById(R.id.btClass);
+        ImageView btClass = (ImageView) view.findViewById(android.R.id.icon);
         btClass.setImageResource(mCachedDevice.getBtClassDrawable());
         btClass.setAlpha(isEnabled() ? 255 : sDimAlpha);
 
diff --git a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java b/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
index c0df8a74140..bd2899540d9 100644
--- a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
@@ -48,7 +48,7 @@ public class BluetoothProfilePreference extends Preference implements OnClickLis
 
         mProfile = profile;
 
-        setLayoutResource(R.layout.preference_bluetooth_profile);
+        setWidgetLayoutResource(R.layout.preference_bluetooth_profile);
         setExpanded(false);
     }
 
@@ -73,7 +73,7 @@ public class BluetoothProfilePreference extends Preference implements OnClickLis
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        ImageView btProfile = (ImageView) view.findViewById(R.id.profileIcon);
+        ImageView btProfile = (ImageView) view.findViewById(android.R.id.icon);
         btProfile.setImageDrawable(mProfileDrawable);
 
         mProfileExpandView = (ImageView) view.findViewById(R.id.profileExpand);
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index d6f192a119c..780d261545f 100644
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -295,6 +295,7 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment
             CheckBoxPreference autoConnectPref = mAutoConnectPrefs.get(prof.toString());
             if (autoConnectPref == null) {
                 autoConnectPref = new CheckBoxPreference(getActivity());
+                autoConnectPref.setLayoutResource(com.android.internal.R.layout.preference_child);
                 autoConnectPref.setKey(prof.toString() + AUTO_CONNECT_KEY_SUFFIX);
                 autoConnectPref.setTitle(getCheckBoxTitle(prof));
                 autoConnectPref.setOrder(getProfilePreferenceIndex(prof) + 1);
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index ad8c25bc949..00e397e5c1f 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -64,7 +64,7 @@ public class PowerGaugePreference extends Preference {
         return mInfo;
     }
 
-    void setIcon(Drawable icon) {
+    void setPowerIcon(Drawable icon) {
         mIcon = icon;
         notifyChanged();
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index aae60eb8497..d1b5aeff1e6 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -734,7 +734,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
                             (PowerGaugePreference) findPreference(
                                     Integer.toString(bs.uidObj.getUid()));
                     if (pgp != null) {
-                        pgp.setIcon(bs.icon);
+                        pgp.setPowerIcon(bs.icon);
                         pgp.setPercent(bs.percent);
                         pgp.setTitle(bs.name);
                     }