diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index 3b91b07..a18596f 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -19,8 +19,8 @@
         android:id="@+id/top"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="50dp"
-        android:paddingRight="50dp">
+        android:paddingLeft="36dp"
+        android:paddingRight="36dp">
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -127,6 +127,7 @@
         android:id="@+id/floating_action_button_container"
         android:layout_width="@dimen/floating_action_button_width"
         android:layout_height="@dimen/floating_action_button_height"
+        android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
         android:layout_gravity="center_horizontal|bottom" >
 
         <ImageButton
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a3c62a9..0a21d27 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -68,7 +68,7 @@
     <!-- Dimensions for Emergency Dialer and dialpad inside the in-call screen -->
     <dimen name="dialpad_horizontal_margin">4dp</dimen>
     <dimen name="dialpad_vertical_margin">2dp</dimen>
-    <dimen name="dialpad_digits_text_size">35sp</dimen>
+    <dimen name="dialpad_digits_text_size">40sp</dimen>
     <dimen name="dialpad_space_above_keys">29dp</dimen>
     <dimen name="dialpad_bottom_key_height">113dp</dimen>
 
@@ -106,5 +106,5 @@
          inside the Emergency Dialer than the regular Dialer. -->
     <dimen name="floating_action_button_width">67dp</dimen>
     <dimen name="floating_action_button_height">67dp</dimen>
-    <dimen name="floating_action_button_margin_bottom">26dp</dimen>
+    <dimen name="floating_action_button_margin_bottom">32dp</dimen>
 </resources>