diff --git a/res/layout/show_all_contacts_fragment.xml b/res/layout/all_contacts_fragment.xml
similarity index 87%
rename from res/layout/show_all_contacts_fragment.xml
rename to res/layout/all_contacts_fragment.xml
index 3b501fb..2ca013a 100644
--- a/res/layout/show_all_contacts_fragment.xml
+++ b/res/layout/all_contacts_fragment.xml
@@ -42,12 +42,13 @@
             android:fastScrollEnabled="true"
             android:fadingEdge="none"
             android:nestedScrollingEnabled="true" />
+
+        <com.android.dialer.widget.EmptyContentView
+            android:id="@+id/empty_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"/>
+
     </FrameLayout>
-
-    <com.android.dialer.widget.EmptyContentView
-        android:id="@+id/empty_list_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"/>
-
 </LinearLayout>
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index 3a7013d..f69c513 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -30,7 +30,8 @@
     <com.android.dialer.widget.EmptyContentView
         android:id="@+id/empty_list_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:visibility="gone" />
 
 </FrameLayout>
diff --git a/res/layout/empty_content_view.xml b/res/layout/empty_content_view.xml
index 18633d0..d8f27aa 100644
--- a/res/layout/empty_content_view.xml
+++ b/res/layout/empty_content_view.xml
@@ -25,12 +25,13 @@
         android:id="@+id/emptyListViewMessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="84dp"
         android:gravity="center_horizontal|top"
         android:textSize="@dimen/empty_list_message_text_size"
         android:textColor="@color/empty_list_text_color"
         android:paddingRight="16dp"
-        android:paddingLeft="16dp" />
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp" />
 
     <TextView
         android:id="@+id/emptyListViewAction"
@@ -47,4 +48,8 @@
         android:clickable="true"
         style="@style/TextActionStyle" />
 
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="40dp" />
+
 </merge>
diff --git a/res/layout/speed_dial_fragment.xml b/res/layout/speed_dial_fragment.xml
index 55dd158..5b6ce4f 100644
--- a/res/layout/speed_dial_fragment.xml
+++ b/res/layout/speed_dial_fragment.xml
@@ -44,7 +44,8 @@
     <com.android.dialer.widget.EmptyContentView
         android:id="@+id/empty_list_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:visibility="gone"/>
 
 </FrameLayout>
diff --git a/src/com/android/dialer/list/AllContactsFragment.java b/src/com/android/dialer/list/AllContactsFragment.java
index 00b629c..19d8a43 100644
--- a/src/com/android/dialer/list/AllContactsFragment.java
+++ b/src/com/android/dialer/list/AllContactsFragment.java
@@ -115,7 +115,7 @@
 
     @Override
     protected View inflateView(LayoutInflater inflater, ViewGroup container) {
-        return inflater.inflate(R.layout.show_all_contacts_fragment, null);
+        return inflater.inflate(R.layout.all_contacts_fragment, null);
     }
 
     @Override