diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
index 8cbb6f2f8da..f9dd6b24a72 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_app.xml
@@ -29,9 +29,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="start|center_vertical"
-        android:minWidth="60dp"
+        android:minWidth="56dp"
         android:orientation="horizontal"
-        android:paddingEnd="12dp"
+        android:paddingEnd="8dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp">
         <android.support.v7.internal.widget.PreferenceImageView
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index f8ac192473f..0414f20e2ff 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -39,7 +39,7 @@
             android:title="@string/location_scanning_screen_title"
             android:fragment="com.android.settings.location.ScanningSettings"/>
 
-        <!-- This preference category gets removed if there is no managed profile -->
+        <!-- This preference gets removed if there is no managed profile -->
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="managed_profile_location_switch"
             android:title="@string/managed_profile_location_switch_title"