diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java
index 0a40a986f87ca..dc87aeb6353f0 100644
--- a/core/java/android/app/AlertDialog.java
+++ b/core/java/android/app/AlertDialog.java
@@ -277,7 +277,6 @@ public class AlertDialog extends Dialog implements DialogInterface {
     public static class Builder {
         private final AlertController.AlertParams P;
         private int mTheme;
-        private Context mWrappedContext;
         
         /**
          * Constructor using a context for this builder and the {@link AlertDialog} it creates.
@@ -291,7 +290,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
          * the {@link AlertDialog} it creates.
          */
         public Builder(Context context, int theme) {
-            P = new AlertController.AlertParams(context);
+            P = new AlertController.AlertParams(new ContextThemeWrapper(context, theme));
             mTheme = theme;
         }
         
@@ -304,10 +303,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
          * @return A Context for built Dialogs.
          */
         public Context getContext() {
-            if (mWrappedContext == null) {
-                mWrappedContext = new ContextThemeWrapper(P.mContext, mTheme);
-            }
-            return mWrappedContext;
+            return P.mContext;
         }
 
         /**
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 0b223b39365c6..0031a01a76ce3 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1505,6 +1505,11 @@
     </style>
 
     <style name="Widget.Holo.Light.Button.Small">
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+        <item name="android:textColor">@android:color/primary_text_holo_light</item>
+        <item name="android:minHeight">40dip</item>
+        <item name="android:paddingLeft">24dip</item>
+        <item name="android:paddingRight">24dip</item>
     </style>
 
     <style name="Widget.Holo.Light.Button.Inset">
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 981c67354cff4..7b25f69eeeae0 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -756,8 +756,8 @@
         <item name="scrollbarTrackVertical">@null</item>
 
         <!-- Text selection handle attributes -->
-        <item name="textSelectHandleLeft">@android:drawable/text_select_handle_middle</item>
-        <item name="textSelectHandleRight">@android:drawable/text_select_handle_middle</item>
+        <item name="textSelectHandleLeft">@android:drawable/text_select_handle_left</item>
+        <item name="textSelectHandleRight">@android:drawable/text_select_handle_right</item>
         <item name="textSelectHandle">@android:drawable/text_select_handle_middle</item>
         <item name="textSelectHandleWindowStyle">@android:style/Widget.Holo.TextSelectHandle</item>
 
@@ -882,7 +882,7 @@
         <item name="textColorHighlightInverse">@android:color/highlighted_text_holo_dark</item>
         <item name="textColorLink">@android:color/link_text_holo_light</item>
         <item name="textColorLinkInverse">@android:color/link_text_holo_dark</item>
-        <item name="textColorAlertDialogListItem">@android:color/primary_text_holo_dark</item>
+        <item name="textColorAlertDialogListItem">@android:color/primary_text_holo_light</item>
 
         <item name="textAppearanceLarge">@android:style/TextAppearance.Holo.Light.Large</item>
         <item name="textAppearanceMedium">@android:style/TextAppearance.Holo.Light.Medium</item>
@@ -985,8 +985,8 @@
         <item name="scrollbarTrackVertical">@null</item>
 
         <!-- Text selection handle attributes -->
-        <item name="textSelectHandleLeft">@android:drawable/text_select_handle_middle</item>
-        <item name="textSelectHandleRight">@android:drawable/text_select_handle_middle</item>
+        <item name="textSelectHandleLeft">@android:drawable/text_select_handle_left</item>
+        <item name="textSelectHandleRight">@android:drawable/text_select_handle_right</item>
         <item name="textSelectHandle">@android:drawable/text_select_handle_middle</item>
         <item name="textSelectHandleWindowStyle">@android:style/Widget.Holo.TextSelectHandle</item>