diff --git a/res/layout/empty_list_view.xml b/res/layout/empty_list_view.xml
index 0313b00..7f961a3 100644
--- a/res/layout/empty_list_view.xml
+++ b/res/layout/empty_list_view.xml
@@ -13,37 +13,30 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="@dimen/empty_list_message_top_padding"
+    android:paddingBottom="@dimen/actionbar_and_tab_height"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
-    <LinearLayout
+    <ImageView
+        android:id="@+id/emptyListViewImage"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:gravity="center_horizontal" />
+
+    <TextView
+        android:id="@+id/emptyListViewMessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/actionbar_and_tab_height"
-        android:layout_centerInParent="true" >
+        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" />
 
-        <ImageView
-            android:id="@+id/emptyListViewImage"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:gravity="center_horizontal" />
-
-        <TextView
-            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" />
-
-    </LinearLayout>
-
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7096148..b8b93cb 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -138,6 +138,7 @@
     <!-- Length of dialpad's shadows in dialer. -->
     <dimen name="shadow_length">10dp</dimen>
 
+    <dimen name="empty_list_message_top_padding">20dp</dimen>
     <dimen name="empty_list_message_text_size">16sp</dimen>
 
     <!-- Dimensions for individual preference cards -->