diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
index b27a12b509a..2e134dee207 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_app.xml
@@ -31,7 +31,6 @@
         android:gravity="start|center_vertical"
         android:minWidth="56dp"
         android:orientation="horizontal"
-        android:paddingStart="4dp"
         android:paddingEnd="8dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp">
diff --git a/src/com/android/settings/accounts/ProviderPreference.java b/src/com/android/settings/accounts/ProviderPreference.java
index 81e02216e1d..1143f8da40c 100644
--- a/src/com/android/settings/accounts/ProviderPreference.java
+++ b/src/com/android/settings/accounts/ProviderPreference.java
@@ -34,7 +34,7 @@ public class ProviderPreference extends RestrictedPreference {
     public ProviderPreference(
             Context context, String accountType, Drawable icon, CharSequence providerName) {
         super(context);
-        setUseSmallIcon(true);
+        setIconSize(ICON_SIZE_MEDIUM);
         mAccountType = accountType;
         setIcon(icon);
         setPersistent(false);
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index 6d4d3b277a7..226daaac555 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications.defaultapps;
 
+import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
+
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -29,8 +31,8 @@ import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.GearPreference;
-import com.android.settingslib.applications.DefaultAppInfo;
 import com.android.settingslib.TwoTargetPreference;
+import com.android.settingslib.applications.DefaultAppInfo;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.wrapper.PackageManagerWrapper;
 
@@ -59,7 +61,7 @@ public abstract class DefaultAppPreferenceController extends AbstractPreferenceC
             // For use small icon because we are displaying an app preference.
             // We only need to do this for TwoTargetPreference because the other prefs are
             // already using AppPreference so their icon is already normalized.
-            ((TwoTargetPreference) preference).setUseSmallIcon(true);
+            ((TwoTargetPreference) preference).setIconSize(ICON_SIZE_MEDIUM);
         }
         if (!TextUtils.isEmpty(defaultAppLabel)) {
             preference.setSummary(defaultAppLabel);
diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java
index 8fa96803432..c2d9388b683 100644
--- a/src/com/android/settings/vpn2/LegacyVpnPreference.java
+++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java
@@ -36,7 +36,7 @@ public class LegacyVpnPreference extends ManageablePreference {
     LegacyVpnPreference(Context context) {
         super(context, null /* attrs */);
         setIcon(R.drawable.ic_vpn_key);
-        setUseSmallIcon(true);
+        setIconSize(ICON_SIZE_SMALL);
     }
 
     public VpnProfile getProfile() {
diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
index e084adaf167..ce1dcb2712b 100644
--- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accounts;
 
+import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
@@ -42,8 +43,8 @@ public class ProviderPreferenceTest {
     public void shouldUseSmallIcon() {
         final ProviderPreference providerPreference = new ProviderPreference(
                 mContext, "account_type", null /* icon */, "provider_name");
-        final boolean useSmallIcon =
-                ReflectionHelpers.getField(providerPreference, "mUseSmallIcon");
-        assertThat(useSmallIcon).isTrue();
+        final int iconSize =
+                ReflectionHelpers.getField(providerPreference, "mIconSize");
+        assertThat(iconSize).isEqualTo(ICON_SIZE_MEDIUM);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
index e87d16f6451..e348d8c6027 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.defaultapps;
 
 
+import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,8 +28,8 @@ import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.applications.DefaultAppInfo;
 import com.android.settingslib.TwoTargetPreference;
+import com.android.settingslib.applications.DefaultAppInfo;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -78,13 +79,13 @@ public class DefaultAppPreferenceControllerTest {
     }
 
     @Test
-    public void updateState_twoTargetPref_shouldUseSmallIcon() {
+    public void updateState_twoTargetPref_shouldUseMediumIcon() {
         final TwoTargetPreference pref = mock(TwoTargetPreference.class);
         mController = new TestPreferenceController(mContext);
 
         mController.updateState(pref);
 
-        verify(pref).setUseSmallIcon(true);
+        verify(pref).setIconSize(ICON_SIZE_MEDIUM);
     }
 
     private static class TestPreferenceController extends DefaultAppPreferenceController {