diff --git a/res/drawable-hdpi/ic_dial_action_call.png b/res/drawable-hdpi/ic_dial_action_call.png
index 1ba3a98..b4bdbd5 100644
--- a/res/drawable-hdpi/ic_dial_action_call.png
+++ b/res/drawable-hdpi/ic_dial_action_call.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_action_delete.png b/res/drawable-hdpi/ic_dial_action_delete.png
index 2e206c8..13ecb30 100644
--- a/res/drawable-hdpi/ic_dial_action_delete.png
+++ b/res/drawable-hdpi/ic_dial_action_delete.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_action_search.png b/res/drawable-hdpi/ic_dial_action_search.png
index 042eed0..48000df 100644
--- a/res/drawable-hdpi/ic_dial_action_search.png
+++ b/res/drawable-hdpi/ic_dial_action_search.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_action_call.png b/res/drawable-mdpi/ic_dial_action_call.png
index 1942899..35f8fbf 100644
--- a/res/drawable-mdpi/ic_dial_action_call.png
+++ b/res/drawable-mdpi/ic_dial_action_call.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_action_delete.png b/res/drawable-mdpi/ic_dial_action_delete.png
index 440ae37..edbcfd0 100644
--- a/res/drawable-mdpi/ic_dial_action_delete.png
+++ b/res/drawable-mdpi/ic_dial_action_delete.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_action_search.png b/res/drawable-mdpi/ic_dial_action_search.png
index 101eeae..a700ce4 100644
--- a/res/drawable-mdpi/ic_dial_action_search.png
+++ b/res/drawable-mdpi/ic_dial_action_search.png
Binary files differ
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index 50bc2a9..57a612b 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -15,122 +15,49 @@
 -->
 
 <!-- Dialpad in the Phone app. -->
-<com.android.phone.ButtonGridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialpad"
-    android:paddingLeft="7dp"
-    android:paddingRight="7dp"
-    android:paddingTop="6dp"
-    android:paddingBottom="6dp"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
+    android:layout_marginTop="10dip"
     android:layout_weight="1">
 
-        <ImageButton android:id="@+id/one"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_1_no_vm"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_one"
-        />
+    <TableRow>
+        <ImageButton android:id="@+id/one" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_1_no_vm" />
+        <ImageButton android:id="@+id/two" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_2" />
+        <ImageButton android:id="@+id/three" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_3" />
+    </TableRow>
 
-        <ImageButton android:id="@+id/two"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_2"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_two"
-        />
+    <TableRow>
+        <ImageButton android:id="@+id/four" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_4" />
+        <ImageButton android:id="@+id/five" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_5" />
+        <ImageButton android:id="@+id/six" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_6" />
+    </TableRow>
 
-        <ImageButton android:id="@+id/three"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_3"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_three"
-        />
+    <TableRow>
+        <ImageButton android:id="@+id/seven" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_7" />
+        <ImageButton android:id="@+id/eight" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_8" />
+        <ImageButton android:id="@+id/nine" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_9" />
+    </TableRow>
 
-        <ImageButton android:id="@+id/four"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_4"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_four"
-        />
+    <TableRow>
+        <ImageButton android:id="@+id/star" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_star" />
+        <ImageButton android:id="@+id/zero" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_0" />
+        <ImageButton android:id="@+id/pound" style="@style/DialtactsDialpadButtonStyle"
+            android:src="@drawable/dial_num_pound" />
 
-        <ImageButton android:id="@+id/five"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_5"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_five"
-        />
-
-        <ImageButton android:id="@+id/six"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_6"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_six"
-        />
-
-        <ImageButton android:id="@+id/seven"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_7"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_seven"
-        />
-
-        <ImageButton android:id="@+id/eight"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_8"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_eight"
-        />
-
-        <ImageButton android:id="@+id/nine"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_9"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_nine"
-        />
-
-        <ImageButton android:id="@+id/star"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_star"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_star"
-        />
-
-        <ImageButton android:id="@+id/zero"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_0"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_zero"
-        />
-
-        <ImageButton android:id="@+id/pound"
-            android:layout_width="88dp"
-            android:layout_height="@dimen/dialpad_button_height"
-            android:src="@drawable/dial_num_pound"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_pound"
-        />
-</com.android.phone.ButtonGridLayout>
+    </TableRow>
+</TableLayout>
diff --git a/res/layout/dialpad_additional_buttons.xml b/res/layout/dialpad_additional_buttons.xml
index a35fae6..cf91053 100644
--- a/res/layout/dialpad_additional_buttons.xml
+++ b/res/layout/dialpad_additional_buttons.xml
@@ -20,42 +20,42 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/dialpad_additional_buttons_height"
     android:layout_gravity="center_horizontal"
-    android:layout_marginTop="6dip"
+    android:layout_marginBottom="8dip"
     android:layout_weight="0.25"
     android:orientation="horizontal">
 
     <!-- Onscreen "Search button -->
     <ImageButton android:id="@+id/searchButton"
         android:layout_width="0px"
-        android:layout_weight="0.25"
+        android:layout_weight="0.30"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
-        android:background="@drawable/btn_dial_voicemail"
+        android:background="@null"
         android:contentDescription="@string/description_voicemail_button"
-        android:src="@drawable/ic_dial_action_search" />
+        android:src="@drawable/ic_dial_action_search"/>
 
     <!-- Onscreen "Dial" button, diused on all platforms by
          default. Its usage can be disabled using resources (see
          config.xml.) -->
     <ImageButton android:id="@+id/dialButton"
         android:layout_width="0px"
-        android:layout_weight="0.50"
+        android:layout_weight="0.40"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
-        android:background="@drawable/btn_dial_action"
+        android:background="@null"
         android:contentDescription="@string/description_dial_button"
         android:src="@drawable/ic_dial_action_call" />
 
     <!-- Onscreen "Backspace/Delete" button -->
     <ImageButton android:id="@+id/deleteButton"
         android:layout_width="0px"
-        android:layout_weight="0.25"
+        android:layout_weight="0.30"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
-        android:background="@drawable/btn_dial_delete"
+        android:background="@null"
         android:contentDescription="@string/description_delete_button"
         android:src="@drawable/ic_dial_action_delete" />
 </LinearLayout>
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index 7601dfe..b91c27a 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -25,12 +25,16 @@
     <!-- Text field above the keypad where the digits are displayed.
          It's type is set to NULL (to disable the IME keyboard) in the
          java code.
+
+         Background drawable can be controlled programatically.
     -->
     <EditText android:id="@+id/digits"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dialpad_digits_height"
+        android:layout_marginTop="10dip"
         android:gravity="center"
-        android:textAppearance="@style/DialtactsDigitsTextAppearance" />
+        android:textAppearance="@style/DialtactsDigitsTextAppearance"
+        android:textColor="?android:attr/textColorPrimaryInverse" />
 
     <!-- Keypad section -->
     <include layout="@layout/dialpad" />
diff --git a/res/values-long/dimens.xml b/res/values-long/dimens.xml
index 9208e4b..af51d4c 100644
--- a/res/values-long/dimens.xml
+++ b/res/values-long/dimens.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="dialpad_digits_height">74dip</dimen>
+    <dimen name="dialpad_digits_height">80dip</dimen>
     <dimen name="dialpad_additional_buttons_height">58dip</dimen>
-    <dimen name="dialpad_button_height">58dip</dimen>
+    <dimen name="dialpad_button_height">70dip</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6a79817..d89ebcf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -288,18 +288,23 @@
         <item name="android:paddingRight">20dip</item>
     </style>
 
-    <style name="DialtactsDigitsTextAppearance"
-           parent="@android:attr/textAppearanceMedium">
+    <style name="DialtactsDigitsTextAppearance">
         <item name="android:maxLines">1</item>
         <item name="android:scrollHorizontally">true</item>
         <item name="android:textSize">@dimen/dialpad_digits_text_size</item>
         <item name="android:freezesText">true</item>
-        <item name="android:textColor">@color/dialer_button_text</item>
-        <item name="android:background">@drawable/btn_dial_textfield</item>
         <item name="android:focusableInTouchMode">true</item>
         <item name="android:editable">true</item>
         <item name="android:cursorVisible">false</item>
         <item name="android:layout_weight">0</item>
     </style>
 
+    <style name="DialtactsDialpadButtonStyle">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">@dimen/dialpad_button_height</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:background">@null</item>
+        <item name="android:soundEffectsEnabled">false</item>
+        <item name="android:contentDescription">@string/description_image_button_one</item>
+    </style>
 </resources>