diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 68fcb1ba2c3..4033d43b231 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -20,7 +20,7 @@
         android:orientation="vertical">
 
     <FrameLayout android:id="@+id/pinned_header"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone" />
 
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index cc8c1867e72..6cacf2a8662 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -20,7 +20,7 @@
             android:orientation="vertical">
 
     <FrameLayout android:id="@+id/pinned_header"
-                 android:layout_width="match_parent"
+                 android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:visibility="gone" />
 
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index a44535f3d0b..b47e175d2ad 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -25,7 +25,7 @@
       android:background="@android:color/transparent">
 
     <FrameLayout android:id="@+id/pinned_header"
-                 android:layout_width="match_parent"
+                 android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:visibility="gone" />
 
diff --git a/res/layout/user_preference.xml b/res/layout/user_preference.xml
index 79ffc387d25..625a065d4cb 100644
--- a/res/layout/user_preference.xml
+++ b/res/layout/user_preference.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/widget_frame"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/user_spinner_item_height"
         android:orientation="horizontal" >
 
@@ -39,6 +39,7 @@
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
             android:paddingStart="@dimen/user_spinner_padding"
+            android:paddingEnd="@dimen/user_spinner_padding"
             style="@style/TextAppearance.Medium" />
 
 </LinearLayout>
\ No newline at end of file