diff --git a/res/drawable-xhdpi/numpad_0_over.png b/res/drawable-xhdpi/numpad_0_over.png
new file mode 100644
index 000000000..305b4bb8b
Binary files /dev/null and b/res/drawable-xhdpi/numpad_0_over.png differ
diff --git a/res/drawable-xhdpi/numpad_1_over.png b/res/drawable-xhdpi/numpad_1_over.png
new file mode 100644
index 000000000..d45557431
Binary files /dev/null and b/res/drawable-xhdpi/numpad_1_over.png differ
diff --git a/res/drawable-xhdpi/numpad_2_over.png b/res/drawable-xhdpi/numpad_2_over.png
new file mode 100644
index 000000000..c20a6b0fb
Binary files /dev/null and b/res/drawable-xhdpi/numpad_2_over.png differ
diff --git a/res/drawable-xhdpi/numpad_3_over.png b/res/drawable-xhdpi/numpad_3_over.png
new file mode 100644
index 000000000..fc9471697
Binary files /dev/null and b/res/drawable-xhdpi/numpad_3_over.png differ
diff --git a/res/drawable-xhdpi/numpad_4_over.png b/res/drawable-xhdpi/numpad_4_over.png
new file mode 100644
index 000000000..b7600314c
Binary files /dev/null and b/res/drawable-xhdpi/numpad_4_over.png differ
diff --git a/res/drawable-xhdpi/numpad_5_over.png b/res/drawable-xhdpi/numpad_5_over.png
new file mode 100644
index 000000000..e90b11bd7
Binary files /dev/null and b/res/drawable-xhdpi/numpad_5_over.png differ
diff --git a/res/drawable-xhdpi/numpad_6_over.png b/res/drawable-xhdpi/numpad_6_over.png
new file mode 100644
index 000000000..a3f840217
Binary files /dev/null and b/res/drawable-xhdpi/numpad_6_over.png differ
diff --git a/res/drawable-xhdpi/numpad_7_over.png b/res/drawable-xhdpi/numpad_7_over.png
new file mode 100644
index 000000000..6d071f7ec
Binary files /dev/null and b/res/drawable-xhdpi/numpad_7_over.png differ
diff --git a/res/drawable-xhdpi/numpad_8_over.png b/res/drawable-xhdpi/numpad_8_over.png
new file mode 100644
index 000000000..37b47df28
Binary files /dev/null and b/res/drawable-xhdpi/numpad_8_over.png differ
diff --git a/res/drawable-xhdpi/numpad_9_over.png b/res/drawable-xhdpi/numpad_9_over.png
new file mode 100644
index 000000000..ffce7c1af
Binary files /dev/null and b/res/drawable-xhdpi/numpad_9_over.png differ
diff --git a/res/drawable-xhdpi/numpad_sharp.png b/res/drawable-xhdpi/numpad_hash.png
similarity index 100%
rename from res/drawable-xhdpi/numpad_sharp.png
rename to res/drawable-xhdpi/numpad_hash.png
diff --git a/res/drawable-xhdpi/numpad_hash_over.png b/res/drawable-xhdpi/numpad_hash_over.png
new file mode 100644
index 000000000..0d4858fe7
Binary files /dev/null and b/res/drawable-xhdpi/numpad_hash_over.png differ
diff --git a/res/drawable-xhdpi/numpad_star_over.png b/res/drawable-xhdpi/numpad_star_over.png
new file mode 100644
index 000000000..a73206aca
Binary files /dev/null and b/res/drawable-xhdpi/numpad_star_over.png differ
diff --git a/res/drawable/numpad_eight.xml b/res/drawable/numpad_eight.xml
index 763d0c064..0bc160196 100644
--- a/res/drawable/numpad_eight.xml
+++ b/res/drawable/numpad_eight.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_8" />
+        android:drawable="@drawable/numpad_8_over" />
     <item
          android:drawable="@drawable/numpad_8" />
 </selector>
diff --git a/res/drawable/numpad_five.xml b/res/drawable/numpad_five.xml
index 68905d8dc..7b16e525c 100644
--- a/res/drawable/numpad_five.xml
+++ b/res/drawable/numpad_five.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_5" />
+        android:drawable="@drawable/numpad_5_over" />
     <item
          android:drawable="@drawable/numpad_5" />
 </selector>
diff --git a/res/drawable/numpad_four.xml b/res/drawable/numpad_four.xml
index 8a33aa727..0c58614bf 100644
--- a/res/drawable/numpad_four.xml
+++ b/res/drawable/numpad_four.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_4" />
+        android:drawable="@drawable/numpad_4_over" />
     <item
          android:drawable="@drawable/numpad_4" />
 </selector>
diff --git a/res/drawable/numpad_nine.xml b/res/drawable/numpad_nine.xml
index 89e64bb5d..32059b5be 100644
--- a/res/drawable/numpad_nine.xml
+++ b/res/drawable/numpad_nine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_9" />
+        android:drawable="@drawable/numpad_9_over" />
     <item
          android:drawable="@drawable/numpad_9" />
 </selector>
diff --git a/res/drawable/numpad_one.xml b/res/drawable/numpad_one.xml
index 5ab62abf9..dc46fba4b 100644
--- a/res/drawable/numpad_one.xml
+++ b/res/drawable/numpad_one.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_1" />
+        android:drawable="@drawable/numpad_1_over" />
     <item
          android:drawable="@drawable/numpad_1" />
 </selector>
diff --git a/res/drawable/numpad_seven.xml b/res/drawable/numpad_seven.xml
index 77c25de64..7f152177e 100644
--- a/res/drawable/numpad_seven.xml
+++ b/res/drawable/numpad_seven.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_7" />
+        android:drawable="@drawable/numpad_7_over" />
     <item
          android:drawable="@drawable/numpad_7" />
 </selector>
diff --git a/res/drawable/numpad_sharp.xml b/res/drawable/numpad_sharp.xml
index 3eb96ae81..56eebda1e 100644
--- a/res/drawable/numpad_sharp.xml
+++ b/res/drawable/numpad_sharp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_sharp" />
+        android:drawable="@drawable/numpad_hash_over" />
     <item
-         android:drawable="@drawable/numpad_sharp" />
+         android:drawable="@drawable/numpad_hash" />
 </selector>
 
diff --git a/res/drawable/numpad_six.xml b/res/drawable/numpad_six.xml
index b0d125c3b..88620e5f9 100644
--- a/res/drawable/numpad_six.xml
+++ b/res/drawable/numpad_six.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_6" />
+        android:drawable="@drawable/numpad_6_over" />
     <item
          android:drawable="@drawable/numpad_6" />
 </selector>
diff --git a/res/drawable/numpad_star.xml b/res/drawable/numpad_star.xml
index f9da0ab53..a68ea64c9 100644
--- a/res/drawable/numpad_star.xml
+++ b/res/drawable/numpad_star.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_star" />
+        android:drawable="@drawable/numpad_star_over" />
     <item
          android:drawable="@drawable/numpad_star" />
 </selector>
diff --git a/res/drawable/numpad_three.xml b/res/drawable/numpad_three.xml
index 603a16a9a..3828174b7 100644
--- a/res/drawable/numpad_three.xml
+++ b/res/drawable/numpad_three.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_3" />
+        android:drawable="@drawable/numpad_3_over" />
     <item
          android:drawable="@drawable/numpad_3" />
 </selector>
diff --git a/res/drawable/numpad_two.xml b/res/drawable/numpad_two.xml
index b959e21e4..8b60338cc 100644
--- a/res/drawable/numpad_two.xml
+++ b/res/drawable/numpad_two.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_2" />
+        android:drawable="@drawable/numpad_2_over" />
     <item
          android:drawable="@drawable/numpad_2" />
 </selector>
diff --git a/res/drawable/numpad_zero.xml b/res/drawable/numpad_zero.xml
index a6901f93b..34a4ed955 100644
--- a/res/drawable/numpad_zero.xml
+++ b/res/drawable/numpad_zero.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_0" />
+        android:drawable="@drawable/numpad_0_over" />
     <item
          android:drawable="@drawable/numpad_0" />
 </selector>
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 754f19630..fdd9ca672 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -79,10 +79,11 @@
     <org.linphone.ui.Numpad
         android:contentDescription="@string/content_description_numpad"
 	    android:id="@+id/Dialer"
-		android:layout_centerInParent="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+		android:padding="10dp"
         android:layout_above="@id/controls"
-        android:layout_below="@id/AddressBar" />
+        android:layout_below="@id/AddressBar"
+		android:layout_centerInParent="true"/>
 
 </RelativeLayout>
diff --git a/res/layout/numpad.xml b/res/layout/numpad.xml
index 95dd39a67..93f4d1342 100644
--- a/res/layout/numpad.xml
+++ b/res/layout/numpad.xml
@@ -1,291 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:layout_margin="20dp"
-	android:layout_weight="1">
+			 android:layout_width="match_parent" android:layout_height="match_parent" android:shrinkColumns="*" >
 
-	<TableRow android:layout_weight="1">
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
+<TableRow android:layout_weight="1" android:gravity="center">
+	<org.linphone.ui.Digit android:id="@+id/Digit1"	android:text="1" style="@style/DialerDigit" android:background="@drawable/numpad_one" android:soundEffectsEnabled="true"/>
+	<org.linphone.ui.Digit android:id="@+id/Digit2"	android:text="2" style="@style/DialerDigit" android:background="@drawable/numpad_two" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/Digit3"	android:text="3" style="@style/DialerDigit" android:background="@drawable/numpad_three" android:soundEffectsEnabled="true" />
+</TableRow>
 
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit1"
-				android:text="1"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
+<TableRow android:layout_weight="1" android:gravity="center">
+	<org.linphone.ui.Digit android:id="@+id/Digit4"	android:text="4" style="@style/DialerDigit" android:background="@drawable/numpad_four" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/Digit5"	android:text="5" style="@style/DialerDigit" android:background="@drawable/numpad_five" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/Digit6"	android:text="6" style="@style/DialerDigit" android:background="@drawable/numpad_six" android:soundEffectsEnabled="true" />
+</TableRow>
 
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_one"/>
+<TableRow android:layout_weight="1" android:gravity="center">
+	<org.linphone.ui.Digit android:id="@+id/Digit7"	android:text="7" style="@style/DialerDigit" android:background="@drawable/numpad_seven" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/Digit8"	android:text="8" style="@style/DialerDigit" android:background="@drawable/numpad_eight" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/Digit9"	android:text="9" style="@style/DialerDigit" android:background="@drawable/numpad_nine" android:soundEffectsEnabled="true" />
+</TableRow>
 
+<TableRow android:layout_weight="1" android:gravity="center">
+	<org.linphone.ui.Digit android:id="@+id/DigitStar" android:text="*"  style="@style/DialerDigit" android:background="@drawable/numpad_star" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/Digit00"   android:text="0+" style="@style/DialerDigit" android:background="@drawable/numpad_zero" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/DigitHash" android:text="#"  style="@style/DialerDigit" android:background="@drawable/numpad_sharp" android:soundEffectsEnabled="true" />
+</TableRow>
 
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit2"
-				android:text="2"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_two"/>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit3"
-				android:text="3"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_three"/>
-
-		</RelativeLayout>
-	</TableRow>
-	
-	<TableRow android:layout_weight="1">
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit4"
-				android:text="4"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_four"/>
-
-
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit5"
-				android:text="5"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_five"/>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit6"
-				android:text="6"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_six"/>
-
-		</RelativeLayout>
-	</TableRow>
-	
-	<TableRow android:layout_weight="1">
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit7"
-				android:text="7"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_seven"/>
-
-
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit8"
-				android:text="8"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_eight"/>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit9"
-				android:text="9"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_nine"/>
-
-		</RelativeLayout>
-	</TableRow>
-	
-	<TableRow android:layout_weight="1">
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/DigitStar"
-				android:text="*"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_star"/>
-
-
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/Digit00"
-				android:text="0+"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_zero"/>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:padding="5dp"
-			android:layout_height="wrap_content">
-
-			<org.linphone.ui.Digit
-				android:id="@+id/DigitHash"
-				android:text="#"
-				style="@style/DialerDigit"
-				android:background="@android:color/transparent"
-				android:soundEffectsEnabled="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentLeft="true"/>
-
-			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:src="@drawable/numpad_sharp"/>
-
-		</RelativeLayout>
-	</TableRow>
-	
-</TableLayout>
-<!-- android:layout_width="fill_parent" android:layout_height="fill_parent" android:textColor="@android:color/black" android:background="@drawable/clavier_bg" android:textStyle="bold" android:textSize="20sp" android:layout_weight="1" -->
-        
\ No newline at end of file
+</TableLayout>
\ No newline at end of file
diff --git a/res/values/digit_style.xml b/res/values/digit_style.xml
index 328ddb4b1..61f6a8f6c 100644
--- a/res/values/digit_style.xml
+++ b/res/values/digit_style.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="DialerDigit" parent="@android:style/TextAppearance.Medium">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_gravity">center</item>
-        <item name="android:textColor">@android:color/transparent</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:layout_weight">1</item>
-    </style>
+	<style name="DialerDigit" parent="@android:style/TextAppearance.Medium">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textColor">@android:color/transparent</item>
+		<item name="android:textSize">20sp</item>
+		<item name="android:scaleType">center</item>
+		<item name="android:adjustViewBounds">true</item>
+		<item name="android:layout_margin">10dp</item>
+	</style>
 
 	<declare-styleable name="Numpad">
 		<attr name="play_dtmf">