diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index 2710696..0000000
--- a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_blue_strong_holo.9.png b/res/drawable-hdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index c88ef14..0000000
--- a/res/drawable-hdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_gel_setting_icn.png b/res/drawable-hdpi/ic_gel_setting_icn.png
deleted file mode 100644
index f805947..0000000
--- a/res/drawable-hdpi/ic_gel_setting_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_gel_wallpaper_icn.png b/res/drawable-hdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index ad13c85..0000000
--- a/res/drawable-hdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_gel_widget_icn.png b/res/drawable-hdpi/ic_gel_widget_icn.png
deleted file mode 100644
index 2bfd2c1..0000000
--- a/res/drawable-hdpi/ic_gel_widget_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_setting.png b/res/drawable-hdpi/ic_setting.png
new file mode 100644
index 0000000..c617154
--- /dev/null
+++ b/res/drawable-hdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wallpaper.png b/res/drawable-hdpi/ic_wallpaper.png
new file mode 100644
index 0000000..5e5d118
--- /dev/null
+++ b/res/drawable-hdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_widget.png b/res/drawable-hdpi/ic_widget.png
new file mode 100644
index 0000000..8c57af0
--- /dev/null
+++ b/res/drawable-hdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-hdpi/screenpanel.9.png b/res/drawable-hdpi/screenpanel.9.png
new file mode 100644
index 0000000..36e7dfd
--- /dev/null
+++ b/res/drawable-hdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png
new file mode 100644
index 0000000..3321fc9
--- /dev/null
+++ b/res/drawable-hdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index efdc861..0000000
--- a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_blue_strong_holo.9.png b/res/drawable-mdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index e3edb64..0000000
--- a/res/drawable-mdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_gel_setting_icn.png b/res/drawable-mdpi/ic_gel_setting_icn.png
deleted file mode 100644
index 096e6bc..0000000
--- a/res/drawable-mdpi/ic_gel_setting_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_gel_wallpaper_icn.png b/res/drawable-mdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index 61a7b7e..0000000
--- a/res/drawable-mdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_gel_widget_icn.png b/res/drawable-mdpi/ic_gel_widget_icn.png
deleted file mode 100644
index 8a2cb7a..0000000
--- a/res/drawable-mdpi/ic_gel_widget_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_setting.png b/res/drawable-mdpi/ic_setting.png
new file mode 100644
index 0000000..0c8ae9d
--- /dev/null
+++ b/res/drawable-mdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_setting_icn.png b/res/drawable-mdpi/ic_setting_icn.png
new file mode 100644
index 0000000..5c32c54
--- /dev/null
+++ b/res/drawable-mdpi/ic_setting_icn.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wallpaper.png b/res/drawable-mdpi/ic_wallpaper.png
new file mode 100644
index 0000000..333a206
--- /dev/null
+++ b/res/drawable-mdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_widget.png b/res/drawable-mdpi/ic_widget.png
new file mode 100644
index 0000000..5f974c2
--- /dev/null
+++ b/res/drawable-mdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-mdpi/screenpanel.9.png b/res/drawable-mdpi/screenpanel.9.png
new file mode 100644
index 0000000..4de3017
--- /dev/null
+++ b/res/drawable-mdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png
new file mode 100644
index 0000000..dd77406
--- /dev/null
+++ b/res/drawable-mdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index 3f8eaf5..0000000
--- a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png b/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index 738cd2a..0000000
--- a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gel_setting_icn.png b/res/drawable-xhdpi/ic_gel_setting_icn.png
deleted file mode 100644
index fe17163..0000000
--- a/res/drawable-xhdpi/ic_gel_setting_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xhdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index d9472d9..0000000
--- a/res/drawable-xhdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gel_widget_icn.png b/res/drawable-xhdpi/ic_gel_widget_icn.png
deleted file mode 100644
index da6e3e9..0000000
--- a/res/drawable-xhdpi/ic_gel_widget_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_setting.png b/res/drawable-xhdpi/ic_setting.png
new file mode 100644
index 0000000..91ba98c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wallpaper.png b/res/drawable-xhdpi/ic_wallpaper.png
new file mode 100644
index 0000000..41dc000
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_widget.png b/res/drawable-xhdpi/ic_widget.png
new file mode 100644
index 0000000..47dcdd1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-xhdpi/screenpanel.9.png b/res/drawable-xhdpi/screenpanel.9.png
new file mode 100644
index 0000000..b4b828d
--- /dev/null
+++ b/res/drawable-xhdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/screenpanel_hover.9.png b/res/drawable-xhdpi/screenpanel_hover.9.png
new file mode 100644
index 0000000..a44dc11
--- /dev/null
+++ b/res/drawable-xhdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xxhdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index 040748a..0000000
--- a/res/drawable-xxhdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/homescreen_blue_strong_holo.9.png b/res/drawable-xxhdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index b75b322..0000000
--- a/res/drawable-xxhdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_gel_setting_icn.png b/res/drawable-xxhdpi/ic_gel_setting_icn.png
deleted file mode 100644
index 813716d..0000000
--- a/res/drawable-xxhdpi/ic_gel_setting_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index 3525446..0000000
--- a/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_gel_widget_icn.png b/res/drawable-xxhdpi/ic_gel_widget_icn.png
deleted file mode 100644
index 9342437..0000000
--- a/res/drawable-xxhdpi/ic_gel_widget_icn.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_setting.png b/res/drawable-xxhdpi/ic_setting.png
new file mode 100644
index 0000000..6e1e662
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_setting.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wallpaper.png b/res/drawable-xxhdpi/ic_wallpaper.png
new file mode 100644
index 0000000..c718444
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wallpaper.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_widget.png b/res/drawable-xxhdpi/ic_widget.png
new file mode 100644
index 0000000..fddfeca
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_widget.png
Binary files differ
diff --git a/res/drawable-xxhdpi/screenpanel.9.png b/res/drawable-xxhdpi/screenpanel.9.png
new file mode 100644
index 0000000..c44f3b8
--- /dev/null
+++ b/res/drawable-xxhdpi/screenpanel.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/screenpanel_hover.9.png b/res/drawable-xxhdpi/screenpanel_hover.9.png
new file mode 100644
index 0000000..1ab18da
--- /dev/null
+++ b/res/drawable-xxhdpi/screenpanel_hover.9.png
Binary files differ
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index e4f4c89..7515793 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -22,24 +22,30 @@
     android:paddingBottom="@dimen/overview_panel_bottom_padding">
 
     <TextView
-        android:id="@+id/widget_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/widget_button_text"
-        android:drawablePadding="4dp"
-        android:drawableTop="@drawable/ic_gel_widget_icn"
-        android:textSize="18dp"/>
-    <Space
-        android:layout_width="@dimen/overview_panel_buttonSpacing"
-        android:layout_height="wrap_content"/>
-    <TextView
         android:id="@+id/wallpaper_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/wallpaper_button_text"
         android:drawablePadding="4dp"
-        android:drawableTop="@drawable/ic_gel_wallpaper_icn"
-        android:textSize="18dp" />
+        android:drawableTop="@drawable/ic_wallpaper"
+        android:gravity="center_horizontal"
+        android:fontFamily="sans-serif-condensed"
+        android:textAllCaps="true"
+        android:textSize="12sp" />
+    <Space
+        android:layout_width="@dimen/overview_panel_buttonSpacing"
+        android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/widget_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/widget_button_text"
+        android:drawablePadding="4dp"
+        android:gravity="center_horizontal"
+        android:drawableTop="@drawable/ic_widget"
+        android:fontFamily="sans-serif-condensed"
+        android:textAllCaps="true"
+        android:textSize="12sp"/>
     <Space
         android:layout_width="@dimen/overview_panel_buttonSpacing"
         android:layout_height="wrap_content"/>
@@ -49,6 +55,9 @@
         android:layout_height="wrap_content"
         android:text="@string/settings_button_text"
         android:drawablePadding="4dp"
-        android:drawableTop="@drawable/ic_gel_setting_icn"
-        android:textSize="18dp" />
+        android:gravity="center_horizontal"
+        android:drawableTop="@drawable/ic_setting"
+        android:fontFamily="sans-serif-condensed"
+        android:textAllCaps="true"
+        android:textSize="12sp" />
 </LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6b9221c..48a06fc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,4 +34,5 @@
     <color name="apps_customize_icon_text_color">#FFF</color>
     <color name="wallpaper_picker_translucent_gray">#66000000</color>
     <color name="folder_items_text_color">#FF333333</color>
+    <color name="outline_color">#FFFFFFFF</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 2027640..fa84b9b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,7 +17,7 @@
     <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
     <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer>
     <!-- Out of 100, the percent to shrink the workspace during overview mode. -->
-    <integer name="config_workspaceOverviewShrinkPercentage">50</integer>
+    <integer name="config_workspaceOverviewShrinkPercentage">58</integer>
 
     <!-- Fade/zoom in/out duration & scale in the AllApps transition.
          Note: This should be less than the workspaceShrinkTime as they happen together. -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7a1a7aa..2910b7c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,7 +41,8 @@
     <dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
     <dimen name="workspace_spring_loaded_page_spacing">15dp</dimen>
     <dimen name="overview_panel_bottom_padding">50dp</dimen>
-    <dimen name="overview_panel_buttonSpacing">40dp</dimen>
+    <dimen name="overview_panel_buttonSpacing">60dp</dimen>
+    <dimen name="overview_mode_page_offset">130dp</dimen>
 
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">4dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8406302..6c05f7d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -284,9 +284,9 @@
 
     <!-- Strings for the customization mode -->
     <!-- Text for widget add button -->
-    <string name="widget_button_text">Add Widget</string>
+    <string name="widget_button_text">Widgets</string>
     <!-- Text for wallpaper change button -->
-    <string name="wallpaper_button_text">Wallpaper</string>
+    <string name="wallpaper_button_text">Wallpapers</string>
     <!-- Text for settings button -->
     <string name="settings_button_text">Settings</string>
 </resources>
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 54f8846..287bb50 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -99,7 +99,7 @@
 
         final Resources res = getContext().getResources();
         mFocusedOutlineColor = mFocusedGlowColor = mPressedOutlineColor = mPressedGlowColor =
-            res.getColor(android.R.color.holo_blue_light);
+            res.getColor(R.color.outline_color);
 
         setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR);
     }
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 661685b..30ca737 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -214,8 +214,8 @@
         final Resources res = getResources();
         mHotseatScale = (float) grid.hotseatIconSize / grid.iconSize;
 
-        mNormalBackground = res.getDrawable(R.drawable.homescreen_blue_normal_holo);
-        mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_blue_strong_holo);
+        mNormalBackground = res.getDrawable(R.drawable.screenpanel);
+        mActiveGlowBackground = res.getDrawable(R.drawable.screenpanel_hover);
 
         mOverScrollLeft = res.getDrawable(R.drawable.overscroll_glow_left);
         mOverScrollRight = res.getDrawable(R.drawable.overscroll_glow_right);
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 763dfa1..31a9797 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -111,6 +111,7 @@
     protected float mTouchX;
 
     protected boolean mFirstLayout = true;
+    private int mNormalChildHeight;
 
     protected int mCurrentPage;
     protected int mRestorePage = -1;
@@ -722,6 +723,10 @@
         super.addView(page, 0, lp);
     }
 
+    public int getNormalChildHeight() {
+        return mNormalChildHeight;
+    }
+
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (!mIsDataReady || getChildCount() == 0) {
@@ -739,6 +744,7 @@
         // viewport, we can be at most one and a half screens offset once we scale down
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int maxSize = Math.max(dm.widthPixels, dm.heightPixels + mInsets.top + mInsets.bottom);
+
         int parentWidthSize, parentHeightSize;
         int scaledWidthSize, scaledHeightSize;
         if (mUseMinScale) {
@@ -804,6 +810,7 @@
 
                 childWidth = widthSize - horizontalPadding;
                 childHeight = heightSize - verticalPadding - mInsets.top - mInsets.bottom;
+                mNormalChildHeight = childHeight;
 
             } else {
                 childWidthMode = MeasureSpec.EXACTLY;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8cf2c41..aab0a63 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -170,6 +170,7 @@
     private SpringLoadedDragController mSpringLoadedDragController;
     private float mSpringLoadedShrinkFactor;
     private float mOverviewModeShrinkFactor;
+    private int mOverviewModePageOffset;
 
     // State variable that indicates whether the pages are small (ie when you're
     // in all apps or customize mode)
@@ -304,6 +305,7 @@
             res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f;
         mOverviewModeShrinkFactor =
                 res.getInteger(R.integer.config_workspaceOverviewShrinkPercentage) / 100.0f;
+        mOverviewModePageOffset = res.getDimensionPixelSize(R.dimen.overview_mode_page_offset);
         mCameraDistance = res.getInteger(R.integer.config_cameraDistance);
         mOriginalDefaultPage = mDefaultPage = a.getInt(R.styleable.Workspace_defaultScreen, 1);
         a.recycle();
@@ -403,7 +405,10 @@
         setClipChildren(false);
         setClipToPadding(false);
         setChildrenDrawnWithCacheEnabled(true);
-        setMinScale(0.5f);
+
+        // This is a bit of a hack to account for the fact that we translate the workspace
+        // up a bit, and still need to draw the background covering the whole screen.
+        setMinScale(mOverviewModeShrinkFactor - 0.2f);
         setupLayoutTransition();
 
         final Resources res = getResources();
@@ -1800,6 +1805,17 @@
         }
     }
 
+    int getOverviewModeTranslationY() {
+        int childHeight = getNormalChildHeight();
+        int viewPortHeight = getViewportHeight();
+        int scaledChildHeight = (int) (mOverviewModeShrinkFactor * childHeight);
+
+        int offset = (viewPortHeight - scaledChildHeight) / 2;
+        int offsetDelta = mOverviewModePageOffset - offset + mInsets.top;
+
+        return offsetDelta;
+    }
+
     Animator getChangeStateAnimation(final State state, boolean animated, int delay, int snapPage) {
         if (mState == state) {
             return null;
@@ -1824,6 +1840,7 @@
         float finalHotseatAndPageIndicatorAlpha = (stateIsOverview || stateIsSmall) ? 0f : 1f;
         float finalOverviewPanelAlpha = stateIsOverview ? 1f : 0f;
         float finalSearchBarAlpha = stateIsOverview ? 0f : 1f;
+        float finalWorkspaceTranslationY = stateIsOverview ? getOverviewModeTranslationY() : 0;
 
         boolean zoomIn = true;
         mNewScale = 1.0f;
@@ -1879,8 +1896,6 @@
                 mOldBackgroundAlphas[i] = cl.getBackgroundAlpha();
                 mNewBackgroundAlphas[i] = finalBackgroundAlpha;
             } else {
-                setScaleX(mNewScale);
-                setScaleY(mNewScale);
                 cl.setBackgroundAlpha(finalBackgroundAlpha);
                 cl.setShortcutAndWidgetAlpha(finalAlpha);
             }
@@ -1891,6 +1906,7 @@
             LauncherViewPropertyAnimator scale = new LauncherViewPropertyAnimator(this);
             scale.scaleX(mNewScale)
                 .scaleY(mNewScale)
+                .translationY(finalWorkspaceTranslationY)
                 .setInterpolator(mZoomInInterpolator);
             anim.play(scale);
             for (int index = 0; index < getChildCount(); index++) {
@@ -1961,6 +1977,9 @@
             searchBar.setAlpha(finalSearchBarAlpha);
             AlphaUpdateListener.updateVisibility(searchBar);
             updateCustomContentVisibility();
+            setScaleX(mNewScale);
+            setScaleY(mNewScale);
+            setTranslationY(finalWorkspaceTranslationY);
         }
         if (finalSearchBarAlpha == 0) {
             mLauncher.setVoiceButtonProxyVisible(false);
@@ -2148,7 +2167,7 @@
      * Responsibility for the bitmap is transferred to the caller.
      */
     private Bitmap createDragOutline(View v, Canvas canvas, int padding) {
-        final int outlineColor = getResources().getColor(android.R.color.holo_blue_light);
+        final int outlineColor = getResources().getColor(R.color.outline_color);
         final Bitmap b = Bitmap.createBitmap(
                 v.getWidth() + padding, v.getHeight() + padding, Bitmap.Config.ARGB_8888);
 
@@ -2165,7 +2184,7 @@
      */
     private Bitmap createDragOutline(Bitmap orig, Canvas canvas, int padding, int w, int h,
             boolean clipAlpha) {
-        final int outlineColor = getResources().getColor(android.R.color.holo_blue_light);
+        final int outlineColor = getResources().getColor(R.color.outline_color);
         final Bitmap b = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
         canvas.setBitmap(b);