diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index 2101d08..52799e4 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -16,6 +16,6 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/dialer_accent_color">
+    android:color="@color/floating_action_button_touch_tint">
     <item android:drawable="@drawable/fab_green" />
 </ripple>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f629da0..c7701fc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -45,12 +45,14 @@
     <color name="actionbar_background_color_dark">@color/dialer_theme_color_dark</color>
     <!-- Color for icons in the actionbar. Ensure this stays in sync with Dialer version. -->
     <color name="actionbar_icon_color">#ffffff</color>
+    <!-- Color of title text in actionbar. Ensure this stays in sync with Dialer version. -->
+    <color name="actionbar_text_color">#ffffff</color>
 
     <!-- Color for the setting text. -->
     <color name="setting_primary_color">#4d4c4c</color>
     <!-- Color for the setting description text. -->
     <color name="setting_secondary_color">#989898</color>
-    <color name="dialer_dialpad_touch_tint">#331dc7db</color>
-    <color name="dialer_accent_color">#eeff41</color>
+    <color name="dialer_dialpad_touch_tint">#330288d1</color>
+    <color name="floating_action_button_touch_tint">#80ffffff</color>
     <color name="dialer_theme_color">#0288d1</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0cd350b..267f142 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -69,6 +69,8 @@
     <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_space_above_keys">29dp</dimen>
+    <dimen name="dialpad_bottom_key_height">113dp</dimen>
 
     <!-- Just used in landscape mode -->
     <dimen name="emergency_dialer_digits_height">0px</dimen>
@@ -98,4 +100,12 @@
     <dimen name="action_bar_height">56dp</dimen>
     <dimen name="action_bar_elevation">2dp</dimen>
     <dimen name="actionbar_contentInsetStart">72dp</dimen>
+
+    <!-- Width, height and bottom margin for the floating action button. These values are
+         intentionally larger than the values used inside Dialer, since the dialpad is larger
+         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>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index afc1bd2..d886dab 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -234,19 +234,22 @@
     <style name="ContactsActionBarStyle"
            parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
         <item name="android:background">@color/people_app_theme_color</item>
-        <item name="android:backgroundStacked">@color/people_app_theme_color</item>
+        <item name="android:backgroundStacked">@color/people_app_theme_color</item>gs
     </style>
 
     <!-- Style for the call settings action bar.  Should be kept in sync with Dialer. -->
-    <style name="DialtactsActionBarStyle" parent="android:Widget.Material.ActionBar">
+    <style name="DialtactsActionBarStyle" parent="@style/TelephonyActionBarStyle">
+        <!-- Shift the title text to the right -->
+        <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
+    </style>
+
+    <style name="TelephonyActionBarStyle" parent="android:Widget.Material.ActionBar">
         <item name="android:background">@color/actionbar_background_color</item>
         <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
         <item name="android:height">@dimen/action_bar_height</item>
         <item name="android:elevation">@dimen/action_bar_elevation</item>
         <!-- Empty icon -->
         <item name="android:icon">@android:color/transparent</item>
-        <!-- Shift the title text to the right -->
-        <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
     </style>
 
     <!-- Text in the action bar at the top of the screen.  Should be kept in sync with Dialer. -->
@@ -263,6 +266,9 @@
 
     <style name="EmergencyDialerTheme" parent="@android:style/Theme.Material.Light">
         <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item>
+        <item name="android:actionBarStyle">@style/TelephonyActionBarStyle</item>
+        <item name="android:colorPrimary">@color/dialer_theme_color</item>
+        <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
     </style>
 
     <style name="SimImportTheme"