diff --git a/res/values-land/config.xml b/res/values-land/config.xml
index 07eac4ff34..cbc0a6eda5 100644
--- a/res/values-land/config.xml
+++ b/res/values-land/config.xml
@@ -19,7 +19,7 @@
     <!-- Whether or not the drop targets drop down as opposed to fade in -->
     <bool name="config_useDropTargetDownTransition">false</bool>
     <!-- Whether or not to fade the side pages -->
-    <bool name="config_workspaceFadeAdjacentScreens">true</bool>
+    <bool name="config_workspaceFadeAdjacentScreens">false</bool>
 
     <!-- Padding applied to AppWidgets -->
     <dimen name="app_widget_padding_top">8dp</dimen>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index da42b8566c..52c52f18bb 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -31,7 +31,7 @@
          really only in spring loaded mode... -->
     <dimen name="workspace_top_padding">0dp</dimen>
     <dimen name="workspace_bottom_padding">0dp</dimen>
-    <dimen name="workspace_page_spacing">8dp</dimen>
+    <dimen name="workspace_page_spacing">-1dp</dimen>
     <dimen name="workspace_divider_padding_left">0dp</dimen>
     <dimen name="workspace_divider_padding_right">0dp</dimen>
     <dimen name="workspace_divider_padding_top">12dp</dimen>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index 2abd9d7223..5632fcd3e0 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -22,7 +22,7 @@
          for the portals to look right. -->
     <dimen name="workspace_top_padding">2dp</dimen>
     <dimen name="workspace_bottom_padding">2dp</dimen>
-    <dimen name="workspace_page_spacing">8dp</dimen>
+    <dimen name="workspace_page_spacing">-1dp</dimen>
 
     <integer name="apps_customize_cellCountX">4</integer>
     <integer name="apps_customize_cellCountY">5</integer>
diff --git a/res/values-sw340dp-port/config.xml b/res/values-sw340dp-port/config.xml
index d1f3085769..d31ee59690 100644
--- a/res/values-sw340dp-port/config.xml
+++ b/res/values-sw340dp-port/config.xml
@@ -17,5 +17,5 @@
 <resources>
 <!-- Workspace -->
     <!-- Whether or not to fade the side pages -->
-    <bool name="config_workspaceFadeAdjacentScreens">true</bool>
+    <bool name="config_workspaceFadeAdjacentScreens">false</bool>
 </resources>
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 2b5847bde8..4fdb198d17 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -475,15 +475,17 @@ public abstract class PagedView extends ViewGroup {
         if (heightMode == MeasureSpec.AT_MOST) {
             heightSize = maxChildHeight + verticalPadding;
         }
+
+        updateScrollingIndicatorPosition();
+
+        setMeasuredDimension(widthSize, heightSize);
+
+        // We can't call getChildOffset/getRelativeChildOffset until we set the measured dimensions
         if (childCount > 0) {
             mMaxScrollX = getChildOffset(childCount - 1) - getRelativeChildOffset(childCount - 1);
         } else {
             mMaxScrollX = 0;
         }
-
-        updateScrollingIndicatorPosition();
-
-        setMeasuredDimension(widthSize, heightSize);
     }
 
     protected void scrollToNewPageWithoutMovingPages(int newCurrentPage) {
@@ -553,6 +555,11 @@ public abstract class PagedView extends ViewGroup {
             if (DEBUG) Log.d(TAG, "getRelativeChildOffset(): " + getMeasuredWidth() + ", "
                     + getChildWidth(0));
             childLeft = getRelativeChildOffset(0);
+
+            // Calculate the variable page spacing if necessary
+            if (mPageSpacing < 0) {
+                mPageSpacing = ((right - left) - getChildAt(0).getMeasuredWidth()) / 2;
+            }
         }
 
         for (int i = 0; i < childCount; i++) {
@@ -1818,16 +1825,15 @@ public abstract class PagedView extends ViewGroup {
         if (mScrollIndicator == null) return;
         int numPages = getChildCount();
         int pageWidth = getMeasuredWidth();
-        int maxPageWidth = (numPages * getChildWidth(0)) + ((numPages - 1) * mPageSpacing);
-        int maxScrollPosition = maxPageWidth - pageWidth; // n-1 * pageWidth
+        int lastChildIndex = Math.max(0, getChildCount() - 1);
+        int maxScrollX = getChildOffset(lastChildIndex) - getRelativeChildOffset(lastChildIndex);
         int trackWidth = pageWidth - mScrollIndicatorPaddingLeft - mScrollIndicatorPaddingRight;
         int indicatorWidth = mScrollIndicator.getMeasuredWidth() -
                 mScrollIndicator.getPaddingLeft() - mScrollIndicator.getPaddingRight();
 
-        float offset = (float) Math.max(0f, Math.min(maxScrollPosition, getScrollX()))
-                / maxPageWidth;
+        float offset = Math.max(0f, Math.min(1f, (float) getScrollX() / maxScrollX));
         int indicatorSpace = trackWidth / numPages;
-        int indicatorPos = (int) (offset * trackWidth) + mScrollIndicatorPaddingLeft;
+        int indicatorPos = (int) (offset * (trackWidth - indicatorSpace)) + mScrollIndicatorPaddingLeft;
         if (hasElasticScrollIndicator()) {
             if (mScrollIndicator.getMeasuredWidth() != indicatorSpace) {
                 mScrollIndicator.getLayoutParams().width = indicatorSpace;