diff --git a/astrid/res/layout/astrid_time_picker.xml b/astrid/res/layout/astrid_time_picker.xml
index ef96be6e7..d95d3dd26 100644
--- a/astrid/res/layout/astrid_time_picker.xml
+++ b/astrid/res/layout/astrid_time_picker.xml
@@ -35,7 +35,7 @@
 	    <ToggleButton
 	        android:id="@+id/am_button"
 	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
+	        android:layout_height="42dip"
 	        android:paddingTop="8dip"
 	        android:paddingBottom="8dip"
 	        android:textSize="18sp"
@@ -47,7 +47,7 @@
         <ToggleButton
 	        android:id="@+id/pm_button"
 	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
+	        android:layout_height="42dip"
 	        android:paddingTop="8dip"
 	        android:paddingBottom="8dip"
 	        android:textSize="18sp"
@@ -61,7 +61,7 @@
     <ToggleButton
         android:id="@+id/hasTime"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="42dip"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
         android:textSize="18sp"
diff --git a/astrid/res/layout/deadline_number_picker.xml b/astrid/res/layout/deadline_number_picker.xml
index 24b3a3ed6..345a1f273 100644
--- a/astrid/res/layout/deadline_number_picker.xml
+++ b/astrid/res/layout/deadline_number_picker.xml
@@ -20,7 +20,7 @@
 
     <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/increment"
         android:layout_width="fill_parent"
-        android:layout_height="36dip"
+        android:layout_height="38dip"
         android:src="@drawable/icn_arrow_up"
         />
     
@@ -38,7 +38,7 @@
         
         <EditText android:id="@+id/timepicker_input"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="40dip"
             android:layout_weight="1"
             style="?android:attr/textAppearanceLarge"
             android:gravity="center"
@@ -58,7 +58,7 @@
         
     <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/decrement"
         android:layout_width="fill_parent"
-        android:layout_height="36dip"
+        android:layout_height="38dip"
         android:src="@drawable/icn_arrow_down"
         android:paddingTop="15dip"
         />
diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
index 01e64c2b7..95caa1010 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
@@ -134,7 +134,7 @@ public class DateAndTimePicker extends LinearLayout {
 
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         for (int i = 0; i < urgencyValues.size(); i++) {
-            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 0);
+            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, (int) (42 * metrics.density), 0);
             UrgencyValue uv = urgencyValues.get(i);
 
             ToggleButton tb = new ToggleButton(context);