diff --git a/res/drawable-hdpi/no_favorites_banner.png b/res/drawable-hdpi/no_favorites_banner.png
index 5ab45ab..a4b09c0 100644
--- a/res/drawable-hdpi/no_favorites_banner.png
+++ b/res/drawable-hdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-mdpi/no_favorites_banner.png b/res/drawable-mdpi/no_favorites_banner.png
index 808d573..ac080b9 100644
--- a/res/drawable-mdpi/no_favorites_banner.png
+++ b/res/drawable-mdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-xhdpi/no_favorites_banner.png b/res/drawable-xhdpi/no_favorites_banner.png
index da71882..bae4e99 100644
--- a/res/drawable-xhdpi/no_favorites_banner.png
+++ b/res/drawable-xhdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-xxhdpi/no_favorites_banner.png b/res/drawable-xxhdpi/no_favorites_banner.png
index 518e8ef..0e2a4fa 100644
--- a/res/drawable-xxhdpi/no_favorites_banner.png
+++ b/res/drawable-xxhdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/layout/phone_no_favorites.xml b/res/layout/phone_no_favorites.xml
index e0635de..cc9b1ff 100644
--- a/res/layout/phone_no_favorites.xml
+++ b/res/layout/phone_no_favorites.xml
@@ -33,19 +33,14 @@
         android:paddingBottom="16dp"
         android:src="@drawable/no_favorites_banner" />
 
-    <FrameLayout
-        android:id="@+id/show_all_contact_button_in_nofav_frame"
+    <include
+        android:id="@+id/show_all_contact_button_in_nofav"
+        layout="@layout/show_all_contact_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:background="@color/background_dialer_list_items">
-
-        <include
-            android:id="@+id/show_all_contact_button_in_nofav"
-            layout="@layout/show_all_contact_button" />
-    </FrameLayout>
+        android:layout_alignParentStart="true"/>
 
     <TextView
         android:id="@+id/title"
@@ -54,7 +49,7 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:layout_below="@id/nofavorite_image"
-        android:layout_above="@id/show_all_contact_button_in_nofav_frame"
+        android:layout_above="@id/show_all_contact_button_in_nofav"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:text="@string/no_favorites"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3c3d41f..439ccc2 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -68,8 +68,6 @@
     <!-- Undo dialogue color -->
     <color name="undo_dialogue_text_color">#4d4d4d</color>
 
-    <!-- Background color for no favorites state -->
-    <color name="nofavorite_background_color">#ffffff</color>
     <!-- Text color for no favorites message -->
-    <color name="nofavorite_text_color">#a9a9a9</color>
+    <color name="nofavorite_text_color">#777777</color>
 </resources>
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index aa81858..828ca70 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -314,43 +314,7 @@
         final int newVisibility = visible ? View.VISIBLE : View.GONE;
 
         if (previousVisibility != newVisibility) {
-            Integer colorFrom = visible ?
-                    getResources().getColor(R.color.background_dialer_light) :
-                    getResources().getColor(R.color.nofavorite_background_color);
-            Integer colorTo = visible ?
-                    getResources().getColor(R.color.nofavorite_background_color) :
-                    getResources().getColor(R.color.background_dialer_light);
-            ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(),
-                    colorFrom, colorTo);
-            colorAnimation.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animator) {
-                    mParentView.setBackgroundColor((Integer)animator.getAnimatedValue());
-                }
-            });
-            colorAnimation.addListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationStart(Animator animator) {
-                    if (!visible) {
-                        mEmptyView.setVisibility(View.GONE);
-                    }
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animator) {
-                    if (visible) {
-                        mEmptyView.setVisibility(View.VISIBLE);
-                    }
-                }
-
-                @Override
-                public void onAnimationCancel(Animator animator) {}
-
-                @Override
-                public void onAnimationRepeat(Animator animator) {}
-            });
-
-            colorAnimation.start();
+            mEmptyView.setVisibility(newVisibility);
         }
     }
 
