diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 3c82290..b7491ba 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -85,6 +85,7 @@
     private OnTouchListener mInterceptTouchListener;
 
     private float mBackgroundAlpha;
+    private float mBackgroundAlphaMultiplier = 1.0f;
 
     private Drawable mBackground;
     private Drawable mBackgroundMini;
@@ -348,7 +349,7 @@
                 bg = mHover ? mBackgroundHover : mBackground;
             }
             if (bg != null) {
-                bg.setAlpha((int) (mBackgroundAlpha * 255));
+                bg.setAlpha((int) (mBackgroundAlpha * mBackgroundAlphaMultiplier * 255));
                 bg.setBounds(mBackgroundRect);
                 bg.draw(canvas);
             }
@@ -864,6 +865,10 @@
         return mBackgroundAlpha;
     }
 
+    public void setBackgroundAlphaMultiplier(float multiplier) {
+        mBackgroundAlphaMultiplier = multiplier;
+    }
+
     public void setBackgroundAlpha(float alpha) {
         mBackgroundAlpha = alpha;
         invalidate();
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 07faed1..239f6de 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -78,9 +78,9 @@
 
     // These are extra scale factors to apply to the mini home screens
     // so as to achieve the desired transform
-    private static final float EXTRA_SCALE_FACTOR_0 = 0.97f;
+    private static final float EXTRA_SCALE_FACTOR_0 = 0.972f;
     private static final float EXTRA_SCALE_FACTOR_1 = 1.0f;
-    private static final float EXTRA_SCALE_FACTOR_2 = 1.08f;
+    private static final float EXTRA_SCALE_FACTOR_2 = 1.10f;
 
     private static final int BACKGROUND_FADE_OUT_DELAY = 300;
     private static final int BACKGROUND_FADE_OUT_DURATION = 300;
@@ -145,6 +145,7 @@
     private ShrinkPosition mWaitingToShrinkPosition;
 
     private boolean mInScrollArea = false;
+    private boolean mInDragMode = false;
 
     private final HolographicOutlineHelper mOutlineHelper = new HolographicOutlineHelper();
     private Bitmap mDragOutline = null;
@@ -213,7 +214,6 @@
                 mIsInUnshrinkAnimation = false;
             }
         };
-
         mSnapVelocity = 600;
     }
 
@@ -305,7 +305,6 @@
                 }
             }
         }
-
         return folders;
     }
 
@@ -525,9 +524,9 @@
     protected void screenScrolled(int screenCenter) {
         final int halfScreenSize = getMeasuredWidth() / 2;
         for (int i = 0; i < getChildCount(); i++) {
-            View v = getChildAt(i);
-            if (v != null) {
-                int totalDistance = v.getMeasuredWidth() + mPageSpacing;
+            CellLayout cl = (CellLayout) getChildAt(i);
+            if (cl != null) {
+                int totalDistance = cl.getMeasuredWidth() + mPageSpacing;
                 int delta = screenCenter - (getChildOffset(i) -
                         getRelativeChildOffset(i) + halfScreenSize);
 
@@ -535,8 +534,11 @@
                 scrollProgress = Math.min(scrollProgress, 1.0f);
                 scrollProgress = Math.max(scrollProgress, -1.0f);
 
+                float mult =  mInDragMode ? 1.0f : Math.abs(scrollProgress);
+                cl.setBackgroundAlphaMultiplier(mult);
+
                 float rotation = WORKSPACE_ROTATION * scrollProgress;
-                v.setRotationY(rotation);
+                cl.setRotationY(rotation);
             }
         }
     }
@@ -713,6 +715,9 @@
         mTouchState = TOUCH_STATE_REST;
         mActivePointerId = INVALID_POINTER;
 
+        CellLayout currentPage = (CellLayout) getChildAt(mCurrentPage);
+        currentPage.setBackgroundAlphaMultiplier(1.0f);
+
         final Resources res = getResources();
         final int screenWidth = getWidth();
         final int screenHeight = getHeight();
@@ -1172,6 +1177,9 @@
             mDragTargetLayout = getCurrentDropLayout();
             mDragTargetLayout.onDragEnter();
             showOutlines();
+            mInDragMode = true;
+            CellLayout cl = (CellLayout) getChildAt(mCurrentPage);
+            cl.setBackgroundAlphaMultiplier(1.0f);
         }
     }
 
@@ -1523,6 +1531,7 @@
         }
         if (!mIsPageMoving) {
             hideOutlines();
+            mInDragMode = false;
         }
         clearAllHovers();
     }
