diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 83d3e20..8356aa8 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -67,7 +67,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/call_detail_contact_background_overlay_height"
-        android:background="#3F000000"
+        android:background="#7F000000"
         android:layout_alignParentLeft="true"
         android:layout_alignBottom="@id/contact_background_sizer"
     />
diff --git a/res/layout/quickcontact_photo_container.xml b/res/layout/quickcontact_photo_container.xml
index b18fddc..4c05a4d 100644
--- a/res/layout/quickcontact_photo_container.xml
+++ b/res/layout/quickcontact_photo_container.xml
@@ -32,8 +32,7 @@
             android:layout_alignBottom="@id/photo"
             android:layout_alignLeft="@id/photo"
             android:layout_alignRight="@id/photo"
-            android:alpha="0.5"
-            android:background="@android:color/black" />
+            android:background="#7F000000" />
         <ImageButton
             android:id="@+id/open_details_button"
             android:src="@drawable/ic_fav_quickcontact_holo_dark"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 2ca8512..79d12f9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -97,11 +97,6 @@
         <attr name="list_item_header_underline_color" format="color" />
     </declare-styleable>
 
-    <declare-styleable name="CallDetailActivity">
-        <attr name="call_detail_transparent_background" format="color" />
-        <attr name="call_detail_contact_background_overlay_alpha" format="float" />
-    </declare-styleable>
-
     <declare-styleable name="CallLog">
         <attr name="call_log_primary_text_color" format="color" />
         <attr name="call_log_primary_background_color" format="color" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6bc5582..dc22fd8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -61,8 +61,6 @@
     <style name="CallDetailActivityTheme" parent="android:Theme.Holo.SplitActionBarWhenNarrow">
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:gravity">top</item>
-        <item name="call_detail_transparent_background">#CC000000</item>
-        <item name="call_detail_contact_background_overlay_alpha">0.25</item>
         <!-- CallLog -->
         <item name="call_log_primary_text_color">#FFFFFF</item>
         <item name="call_log_primary_background_color">#000000</item>
@@ -292,8 +290,7 @@
     </style>
 
     <style name="ContactTileStarredShadowBox">
-        <item name="android:alpha">0.5</item>
-        <item name="android:background">@android:color/black</item>
+        <item name="android:background">#7F000000</item>
     </style>
 
     <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
diff --git a/src/com/android/contacts/list/ContactTileAdapter.java b/src/com/android/contacts/list/ContactTileAdapter.java
index 2c64d8f..57ae072 100644
--- a/src/com/android/contacts/list/ContactTileAdapter.java
+++ b/src/com/android/contacts/list/ContactTileAdapter.java
@@ -458,9 +458,9 @@
             for (int columnCounter = 0; columnCounter < columnCount; columnCounter++) {
                 ContactEntry entry =
                         columnCounter < list.size() ? list.get(columnCounter) : null;
-                        addTileFromEntry(entry, columnCounter);
-                }
+                addTileFromEntry(entry, columnCounter);
             }
+        }
 
         private void addTileFromEntry(ContactEntry entry, int tileIndex) {
             final ContactTileView contactTile;
diff --git a/src/com/android/contacts/list/ContactTileView.java b/src/com/android/contacts/list/ContactTileView.java
index aee34c9..4dfa876 100644
--- a/src/com/android/contacts/list/ContactTileView.java
+++ b/src/com/android/contacts/list/ContactTileView.java
@@ -52,7 +52,6 @@
 
     public ContactTileView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setLayerType(View.LAYER_TYPE_HARDWARE, null);
     }
 
     @Override
diff --git a/src/com/android/contacts/quickcontact/FloatingChildLayout.java b/src/com/android/contacts/quickcontact/FloatingChildLayout.java
index 62b4f1a..5358aca 100644
--- a/src/com/android/contacts/quickcontact/FloatingChildLayout.java
+++ b/src/com/android/contacts/quickcontact/FloatingChildLayout.java
@@ -158,7 +158,7 @@
         final int scaleInterpolator = isExitAnimation ? android.R.interpolator.accelerate_quint
                 : android.R.interpolator.decelerate_quint;
         animator.setInterpolator(AnimationUtils.loadInterpolator(getContext(), scaleInterpolator));
-        final float scaleTarget = isExitAnimation ? 0.7f : 1.0f;
+        final float scaleTarget = isExitAnimation ? 0.5f : 1.0f;
         animator.scaleX(scaleTarget);
         animator.scaleY(scaleTarget);
         animator.alpha(isExitAnimation ? 0.0f : 1.0f);
