diff --git a/res/layout-xlarge/item_group_membership.xml b/res/layout-xlarge/item_group_membership.xml
index 62d20b4..41d77b7 100644
--- a/res/layout-xlarge/item_group_membership.xml
+++ b/res/layout-xlarge/item_group_membership.xml
@@ -32,10 +32,8 @@
         android:textColor="@color/editor_label_text_color"
         android:ellipsize="marquee" />
 
-    <!-- TODO: Change to android.R.attr.spinnerTextStyle when available
-            style="?android:attr/editTextStyle"
-    -->
     <Button
+        style="?android:attr/spinnerStyle"
         android:id="@+id/group_list"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
diff --git a/src/com/android/contacts/editor/EventFieldEditorView.java b/src/com/android/contacts/editor/EventFieldEditorView.java
index fb196fe..7345dbb 100644
--- a/src/com/android/contacts/editor/EventFieldEditorView.java
+++ b/src/com/android/contacts/editor/EventFieldEditorView.java
@@ -36,7 +36,6 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import java.text.ParsePosition;
 import java.util.Calendar;
@@ -126,15 +125,7 @@
 
         if (mDateView == null) {
 
-            // TODO: Change to android.R.attr.spinnerTextStyle when available
-            // mDateView = new Button(getContext(), null, android.R.attr.editTextStyle);
-            mDateView = new Button(getContext());
-            // TODO: Remove hard-coded padding and gravity when android.R.attr.spinnerTextStyle
-            // becomes available
-            mDateView.setPadding(18, mDateView.getPaddingTop(),
-                    mDateView.getPaddingRight(), mDateView.getPaddingBottom());
-            mDateView.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
-
+            mDateView = new Button(getContext(), null, android.R.attr.spinnerStyle);
             mDateView.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
                     LayoutParams.WRAP_CONTENT));
             mDateView.setEnabled(isEnabled() && !readOnly);