diff --git a/res/drawable-xlarge-nodpi/city.jpg b/res/drawable-xlarge-nodpi/city.jpg
index 57a3223..72beb6b 100644
--- a/res/drawable-xlarge-nodpi/city.jpg
+++ b/res/drawable-xlarge-nodpi/city.jpg
Binary files differ
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6f40748..b7cad9f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2675,9 +2675,6 @@
         }
 
         if (animated) {
-            final float oldScaleX = toView.getScaleX();
-            final float oldScaleY = toView.getScaleY();
-
             ValueAnimator scaleAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(duration);
             scaleAnim.setInterpolator(new Workspace.ZoomOutInterpolator());
             scaleAnim.addUpdateListener(new AnimatorUpdateListener() {
@@ -2685,8 +2682,8 @@
                     final float b = (Float) animation.getAnimatedValue();
                     final float a = 1f - b;
                     ((View) toView.getParent()).fastInvalidate();
-                    toView.setFastScaleX(a * oldScaleX + b * 1f);
-                    toView.setFastScaleY(a * oldScaleY + b * 1f);
+                    toView.setFastScaleX(a * scale + b * 1f);
+                    toView.setFastScaleY(a * scale + b * 1f);
                 }
             });
 
