diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
index d781c709..beb30108 100644
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -72,7 +72,7 @@
             android:layout_below="@id/carrier"
             android:layout_marginTop="20dip"
             android:layout_marginLeft="20dip"
-            android:paddingBottom="4dip"
+            android:paddingBottom="2dip"
             >
 
             <TextView android:id="@+id/timeDisplay"
@@ -80,7 +80,7 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:ellipsize="none"
-                android:textSize="72sp"
+                android:textSize="70sp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:shadowColor="#C0000000"
                 android:shadowDx="0"
@@ -120,7 +120,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/date"
-            android:layout_marginTop="2dip"
+            android:layout_marginTop="4dip"
             android:layout_marginLeft="24dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:drawablePadding="4dip"
@@ -197,7 +197,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="0dip"
             />
 
         <!-- emergency call button shown when sim is PUKd and tab_selector is
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml b/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
index d6047655..08d9bad5 100644
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -35,7 +35,7 @@
         >
         <com.android.systemui.statusbar.powerwidget.PowerWidget android:id="@+id/exp_power_stat"
             android:layout_width="match_parent"
-            android:layout_height="40dip"
+            android:layout_height="42dip"
             />
 
         <LinearLayout
diff --git a/overlay/ldpi/packages/apps/ADWLauncher/res/xml/default_workspace.xml b/overlay/ldpi/packages/apps/ADWLauncher/res/xml/default_workspace.xml
deleted file mode 100644
index e74f8796..00000000
--- a/overlay/ldpi/packages/apps/ADWLauncher/res/xml/default_workspace.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
-<!--  ALL APPS -->
-    <shortcut
-        launcher:uri="#Intent;action=com.android.launcher.action.launcheraction;component=com.android.launcher/.CustomShirtcutActivity;i.DefaultLauncherAction.EXTRA_BINDINGVALUE=4;end"
-        launcher:icon="@drawable/all_apps_button"
-        launcher:title="@string/launcher_actions"
-        launcher:screen="-1"
-        launcher:x="-1"
-        launcher:y="-1"
-        launcher:container="-700" />
-    <!-- LAB -->
-    <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.DialtactsActivity"
-        launcher:screen="-1"
-        launcher:x="-1"
-        launcher:y="-1"
-        launcher:container="-300" />
-
-    <!-- RAB -->
-    <favorite
-        launcher:packageName="com.android.mms"
-        launcher:className="com.android.mms.ui.ConversationList"
-        launcher:screen="-1"
-        launcher:x="-1"
-        launcher:y="-1"
-        launcher:container="-400" />
-
-    <!--  Middle screen [2] -->
-    <favorite
-        launcher:packageName="com.android.browser"
-        launcher:className="com.android.browser.BrowserActivity"
-        launcher:screen="2"
-        launcher:x="1"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.android.music"
-        launcher:className="com.android.music.MusicBrowserActivity"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="3" />
-</favorites>
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-finger/audio_player_common_controls.xml b/overlay/ldpi/packages/apps/Music/res/layout-finger/audio_player_common_controls.xml
new file mode 100644
index 00000000..1ca0a989
--- /dev/null
+++ b/overlay/ldpi/packages/apps/Music/res/layout-finger/audio_player_common_controls.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ImageButton android:id="@+id/pause"
+        android:layout_width="116dip"
+        android:layout_height="54dip"
+        android:background="@drawable/btn_playback_middle"
+        android:src="@drawable/btn_playback_ic_play"
+        android:layout_above="@android:id/progress"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="6dip" />
+
+    <com.android.music.RepeatingImageButton android:id="@+id/prev"
+        android:layout_width="56dip"
+        android:layout_height="54dip"
+        android:background="@drawable/btn_playback_left"
+        android:src="@drawable/btn_playback_ic_prev"
+        android:layout_above="@android:id/progress"
+        android:layout_toLeftOf="@id/pause"
+        android:layout_marginBottom="6dip" />
+
+    <com.android.music.RepeatingImageButton android:id="@+id/next"
+        android:layout_width="56dip"
+        android:layout_height="54dip"
+        android:background="@drawable/btn_playback_right"
+        android:src="@drawable/btn_playback_ic_next"
+        android:layout_above="@android:id/progress"
+        android:layout_toRightOf="@id/pause"
+        android:layout_marginBottom="6dip" />
+
+</merge>
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-land-finger/audio_player_common_controls.xml b/overlay/ldpi/packages/apps/Music/res/layout-land-finger/audio_player_common_controls.xml
new file mode 100644
index 00000000..54b410b9
--- /dev/null
+++ b/overlay/ldpi/packages/apps/Music/res/layout-land-finger/audio_player_common_controls.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ImageButton android:id="@+id/pause"
+        android:layout_width="116dip"
+        android:layout_height="54dip"
+        android:background="@drawable/btn_playback_middle"
+        android:src="@drawable/btn_playback_ic_play"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="6dip" />
+
+    <com.android.music.RepeatingImageButton android:id="@+id/prev"
+        android:layout_width="56dip"
+        android:layout_height="54dip"
+        android:background="@drawable/btn_playback_left"
+        android:src="@drawable/btn_playback_ic_prev"
+        android:layout_toLeftOf="@id/pause"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="6dip" />
+
+    <com.android.music.RepeatingImageButton android:id="@+id/next"
+        android:layout_width="56dip"
+        android:layout_height="54dip"
+        android:background="@drawable/btn_playback_right"
+        android:src="@drawable/btn_playback_ic_next"
+        android:layout_toRightOf="@id/pause"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="6dip" />
+
+</merge>
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-land-mdpi-finger/audio_player.xml b/overlay/ldpi/packages/apps/Music/res/layout-land-mdpi-finger/audio_player.xml
index 9485548d..f0420fac 100644
--- a/overlay/ldpi/packages/apps/Music/res/layout-land-mdpi-finger/audio_player.xml
+++ b/overlay/ldpi/packages/apps/Music/res/layout-land-mdpi-finger/audio_player.xml
@@ -37,14 +37,14 @@
         android:layout_alignParentRight="true">
 
         <ImageButton android:id="@+id/repeat"
-            android:layout_width="54dip"
+            android:layout_width="48dip"
             android:layout_height="36dip"
             android:layout_alignParentLeft="true"
-            android:layout_marginLeft="4dip"
+            android:layout_marginLeft="2dip"
             android:background="@drawable/btn_playback_top" />
 
         <ImageButton android:id="@+id/shuffle"
-            android:layout_width="54dip"
+            android:layout_width="48dip"
             android:layout_height="36dip"
             android:layout_alignParentRight="true"
             android:layout_marginRight="4dip"
@@ -67,35 +67,35 @@
             android:text="@string/nowplaying_title" />
 
         <TextView android:id="@+id/artistname"
-            android:textSize="20sp"
+            android:textSize="18sp"
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/nowplaying_title"
-            android:layout_marginTop="12dip"
+            android:layout_marginTop="6dip"
             android:layout_centerHorizontal="true"
-            android:padding="4dip" />
+            android:padding="2dip" />
 
         <TextView android:id="@+id/albumname"
-            android:textSize="16sp"
+            android:textSize="14sp"
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/artistname"
             android:layout_centerHorizontal="true"
-            android:padding="4dip" />
+            android:padding="0dip" />
 
         <TextView android:id="@+id/trackname"
-            android:textSize="16sp"
+            android:textSize="14sp"
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/albumname"
             android:layout_centerHorizontal="true"
-            android:padding="4dip" />
+            android:padding="0dip" />
 
         <include layout="@layout/audio_player_common_controls" />
 
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-mdpi-finger/audio_player.xml b/overlay/ldpi/packages/apps/Music/res/layout-mdpi-finger/audio_player.xml
index a2344af7..7990253a 100644
--- a/overlay/ldpi/packages/apps/Music/res/layout-mdpi-finger/audio_player.xml
+++ b/overlay/ldpi/packages/apps/Music/res/layout-mdpi-finger/audio_player.xml
@@ -22,14 +22,14 @@
     android:paddingTop="2dip">
 
     <ImageButton android:id="@+id/repeat"
-        android:layout_width="54dip"
+        android:layout_width="48dip"
         android:layout_height="36dip"
         android:layout_alignParentLeft = "true"
         android:layout_marginLeft="4dip"
         android:background="@drawable/btn_playback_top" />
 
     <ImageButton android:id="@+id/shuffle"
-        android:layout_width="54dip"
+        android:layout_width="48dip"
         android:layout_height="36dip"
         android:layout_alignParentRight = "true"
         android:layout_marginRight="4dip"
@@ -56,20 +56,20 @@
         android:layout_height="180dip"
         android:layout_centerHorizontal="true"
         android:layout_below="@id/nowplaying_title"
-        android:layout_marginTop="0dip" />
+        android:layout_marginTop="2dip" />
 
     <TextView android:id="@+id/artistname"
-        android:textSize="16sp"
+        android:textSize="18sp"
         android:singleLine="true"
         android:ellipsize="end"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/album"
         android:layout_centerHorizontal="true"
-        android:padding="0dip" />
+        android:padding="2dip" />
 
     <TextView android:id="@+id/albumname"
-        android:textSize="16sp"
+        android:textSize="14sp"
         android:singleLine="true"
         android:ellipsize="end"
         android:layout_width="wrap_content"
@@ -79,7 +79,7 @@
         android:padding="0dip" />
 
     <TextView android:id="@+id/trackname"
-        android:textSize="16sp"
+        android:textSize="14sp"
         android:singleLine="true"
         android:ellipsize="end"
         android:layout_width="wrap_content"
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
index aa9d8bf9..0855a96f 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
@@ -46,7 +46,6 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="40dip"
         />
 
     <!--
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
index b81c7e7d..a7981a89 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="42dip"
+        android:layout_marginBottom="40dip"
         />
 
     <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
@@ -46,7 +46,6 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="42dip"
         />
 
     <!--
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
index e47810bc..bfe97194 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="42dip"
+        android:layout_marginBottom="40dip"
         />
 
     <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
@@ -46,7 +46,6 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="42dip"
         />
 
     <!--
diff --git a/overlay/ldpi/packages/apps/Settings/res/layout/twelve_key_entry.xml b/overlay/ldpi/packages/apps/Settings/res/layout/twelve_key_entry.xml
new file mode 100644
index 00000000..4555b915
--- /dev/null
+++ b/overlay/ldpi/packages/apps/Settings/res/layout/twelve_key_entry.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2008, 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.
+*/
+-->
+
+<!-- This is not a standalone element it can be included into apps that need 12-key input -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="50dip"
+        android:layout_marginLeft="2dip"
+        android:layout_marginRight="2dip"
+        android:orientation="horizontal">
+
+        <Button android:id="@+id/one"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+        <Button android:id="@+id/two"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+        <Button android:id="@+id/three"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="50dip"
+        android:layout_marginLeft="2dip"
+        android:layout_marginRight="2dip"
+        android:orientation="horizontal">
+
+        <Button android:id="@+id/four"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+        <Button android:id="@+id/five"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+        <Button android:id="@+id/six"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="50dip"
+        android:layout_marginLeft="2dip"
+        android:layout_marginRight="2dip"
+        android:orientation="horizontal">
+
+        <Button android:id="@+id/seven"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+        <Button android:id="@+id/eight"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+        <Button android:id="@+id/nine"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="50dip"
+        android:layout_marginLeft="2dip"
+        android:layout_marginRight="2dip"
+        android:orientation="horizontal">
+
+        <Button android:id="@+id/ok"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textStyle="bold"
+            android:text="@android:string/ok"
+        />
+
+        <Button android:id="@+id/zero"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+        />
+
+        <Button android:id="@+id/cancel"
+            android:layout_width="0sp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="2dip"
+            android:layout_marginRight="2dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textStyle="bold"
+            android:text="@android:string/cancel"
+        />
+
+    </LinearLayout>
+
+</LinearLayout>