diff --git a/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png b/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png
index 278c121..a17da61 100644
--- a/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png
+++ b/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture_180_holo_light.png b/res/drawable-hdpi/ic_contact_picture_180_holo_light.png
index 0ce49fe..38e4c30 100644
--- a/res/drawable-hdpi/ic_contact_picture_180_holo_light.png
+++ b/res/drawable-hdpi/ic_contact_picture_180_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture_holo_dark.png b/res/drawable-hdpi/ic_contact_picture_holo_dark.png
index de9157e..314fa00 100644
--- a/res/drawable-hdpi/ic_contact_picture_holo_dark.png
+++ b/res/drawable-hdpi/ic_contact_picture_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture_holo_light.png b/res/drawable-hdpi/ic_contact_picture_holo_light.png
index 2eef7b5..4c0e35e 100644
--- a/res/drawable-hdpi/ic_contact_picture_holo_light.png
+++ b/res/drawable-hdpi/ic_contact_picture_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png b/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png
index cc5dd09..acba333 100644
--- a/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png
+++ b/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_180_holo_light.png b/res/drawable-mdpi/ic_contact_picture_180_holo_light.png
index 77539d3..0b52683 100644
--- a/res/drawable-mdpi/ic_contact_picture_180_holo_light.png
+++ b/res/drawable-mdpi/ic_contact_picture_180_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_holo_dark.png b/res/drawable-mdpi/ic_contact_picture_holo_dark.png
index fb365c4..6876777 100644
--- a/res/drawable-mdpi/ic_contact_picture_holo_dark.png
+++ b/res/drawable-mdpi/ic_contact_picture_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_holo_light.png b/res/drawable-mdpi/ic_contact_picture_holo_light.png
index 6c7cb61..ead9718 100644
--- a/res/drawable-mdpi/ic_contact_picture_holo_light.png
+++ b/res/drawable-mdpi/ic_contact_picture_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png b/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png
index b8ee922..c4c001e 100644
--- a/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png
+++ b/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png b/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png
index 9727b45..f6fd172 100644
--- a/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png
+++ b/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_holo_dark.png b/res/drawable-xhdpi/ic_contact_picture_holo_dark.png
index 9fa0698..ddf797f 100644
--- a/res/drawable-xhdpi/ic_contact_picture_holo_dark.png
+++ b/res/drawable-xhdpi/ic_contact_picture_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_holo_light.png b/res/drawable-xhdpi/ic_contact_picture_holo_light.png
index 1a2bfde..05a65f6 100644
--- a/res/drawable-xhdpi/ic_contact_picture_holo_light.png
+++ b/res/drawable-xhdpi/ic_contact_picture_holo_light.png
Binary files differ
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index 1f74c26..45f40f6 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -20,7 +20,7 @@
     android:id="@+id/dialpad"
     android:layout_width="match_parent"
     android:layout_height="0px"
-    android:layout_weight="0.650"
+    android:layout_weight="@integer/dialpad_layout_weight_dialpad"
     android:layout_gravity="center_horizontal"
     android:layout_marginTop="@dimen/dialpad_vertical_margin"
     android:paddingLeft="5dip"
diff --git a/res/layout/dialpad_additional_buttons.xml b/res/layout/dialpad_additional_buttons.xml
index 836187e..392f97a 100644
--- a/res/layout/dialpad_additional_buttons.xml
+++ b/res/layout/dialpad_additional_buttons.xml
@@ -19,7 +19,7 @@
     android:id="@+id/dialpadAdditionalButtons"
     android:layout_width="match_parent"
     android:layout_height="0px"
-    android:layout_weight="0.150"
+    android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"
     android:layout_gravity="center_horizontal"
     android:background="@drawable/dialpad_background"
     android:orientation="horizontal">
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index 22e9a18..2785af0 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -28,7 +28,7 @@
         android:id="@+id/digits_container"
         android:layout_width="match_parent"
         android:layout_height="0px"
-        android:layout_weight="0.200"
+        android:layout_weight="@integer/dialpad_layout_weight_digits"
         android:layout_marginTop="@dimen/dialpad_vertical_margin"
         android:gravity="center"
         android:background="@drawable/dialpad_background" >
diff --git a/res/values-long-land/dimens.xml b/res/values-long-land/dimens.xml
deleted file mode 100644
index 2046eb0..0000000
--- a/res/values-long-land/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <dimen name="dialpad_digits_margin_bottom">30dip</dimen>
-    <dimen name="dialpad_digits_text_size">34sp</dimen>
-</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 412c9e2..8d6b877 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -205,4 +205,10 @@
     <!--  Width of the lead margin on the left of a block quote inside a stream item -->
     <dimen name="stream_item_stripe_width">8dip</dimen>
 
+    <!-- Layout weight values for dialpad screen. These layouts will be used in one
+         LinearLayout (dialpad_fragment.xml), configuring dialpad screen's vertical
+         ratio. -->
+    <integer name="dialpad_layout_weight_digits">20</integer>
+    <integer name="dialpad_layout_weight_dialpad">65</integer>
+    <integer name="dialpad_layout_weight_additional_buttons">15</integer>
 </resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 1d3f9b9..89246f9 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -21,6 +21,6 @@
     <!-- Number of decoded photo bitmaps retained in an LRU cache -->
     <integer name="config_photo_cache_max_bitmaps">48</integer>
 
-    <!--  Determines the number of columns in a ContactTileRow -->
+    <!-- Determines the number of columns in a ContactTileRow -->
     <integer name="contact_tile_column_count">2</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c30e09e..ed88aaa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1053,17 +1053,6 @@
     <!-- Header for the list of all groups for a contact [CHAR LIMIT=20] -->
     <string name="groupsLabel">Groups</string>
 
-    <!-- Single-character overlay for home phone numbers when creating desktop shortcuts -->
-    <string name="type_short_home">H</string>
-    <!-- Single-character overlay for mobile phone numbers when creating desktop shortcuts -->
-    <string name="type_short_mobile">M</string>
-    <!-- Single-character overlay for work phone numbers when creating desktop shortcuts -->
-    <string name="type_short_work">W</string>
-    <!-- Single-character overlay for pager phone numbers when creating desktop shortcuts -->
-    <string name="type_short_pager">P</string>
-    <!-- Single-character overlay for other phone numbers when creating desktop shortcuts -->
-    <string name="type_short_other">O</string>
-
     <string name="dialog_new_contact_account">Create contact under account</string>
 
     <!-- Title for the disambiguation dialog that requests the user choose an account for the new group to be created under [CHAR LIMIT=NONE] -->