diff --git a/packages/SystemUI/res/drawable/recents_move_task_freeform_dark.xml b/packages/SystemUI/res/drawable/recents_move_task_freeform_dark.xml
index ce07b2da138cb..9a060b4a3d39f 100644
--- a/packages/SystemUI/res/drawable/recents_move_task_freeform_dark.xml
+++ b/packages/SystemUI/res/drawable/recents_move_task_freeform_dark.xml
@@ -14,11 +14,29 @@ Copyright (C) 2015 The Android Open Source Project
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/recents_task_bar_dark_icon_color"
-        android:pathData="M0.0,0.0l0.0,24.0l24.0,0.0L24.0,0.0L0.0,0.0zM4.0,4.0l10.0,0.0l0.0,10.0L4.0,14.0L4.0,4.0z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group
+            android:translateX="-286.000000"
+            android:translateY="-602.000000">
+        <group
+                android:translateX="109.000000"
+                android:translateY="514.000000">
+            <group
+                    android:translateX="178.000000"
+                    android:translateY="89.000000">
+                <path
+                    android:strokeColor="@color/recents_task_bar_dark_icon_color"
+                    android:strokeWidth="2"
+                    android:pathData="M10,12 L10,3 L19,3 L19,5 L19,11 L19,12 L10,12 Z" />
+                <path
+                    android:strokeColor="@color/recents_task_bar_dark_icon_color"
+                    android:strokeWidth="2"
+                    android:pathData="M15,17 L5,17 L5,7 L5,17 Z" />
+            </group>
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_move_task_freeform_light.xml b/packages/SystemUI/res/drawable/recents_move_task_freeform_light.xml
index bf452ae168f05..b8acedb3c2f71 100644
--- a/packages/SystemUI/res/drawable/recents_move_task_freeform_light.xml
+++ b/packages/SystemUI/res/drawable/recents_move_task_freeform_light.xml
@@ -14,11 +14,29 @@ Copyright (C) 2015 The Android Open Source Project
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/recents_task_bar_light_icon_color"
-        android:pathData="M0.0,0.0l0.0,24.0l24.0,0.0L24.0,0.0L0.0,0.0zM4.0,4.0l10.0,0.0l0.0,10.0L4.0,14.0L4.0,4.0z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group
+            android:translateX="-286.000000"
+            android:translateY="-602.000000">
+        <group
+                android:translateX="109.000000"
+                android:translateY="514.000000">
+            <group
+                    android:translateX="178.000000"
+                    android:translateY="89.000000">
+                <path
+                    android:strokeColor="@color/recents_task_bar_light_icon_color"
+                    android:strokeWidth="2"
+                    android:pathData="M10,12 L10,3 L19,3 L19,5 L19,11 L19,12 L10,12 Z" />
+                <path
+                    android:strokeColor="@color/recents_task_bar_light_icon_color"
+                    android:strokeWidth="2"
+                    android:pathData="M15,17 L5,17 L5,7 L5,17 Z" />
+            </group>
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_move_task_fullscreen_dark.xml b/packages/SystemUI/res/drawable/recents_move_task_fullscreen_dark.xml
index 4160efb8cd358..fd468c1ff25e1 100644
--- a/packages/SystemUI/res/drawable/recents_move_task_fullscreen_dark.xml
+++ b/packages/SystemUI/res/drawable/recents_move_task_fullscreen_dark.xml
@@ -14,20 +14,24 @@ Copyright (C) 2015 The Android Open Source Project
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/recents_task_bar_dark_icon_color"
-        android:pathData="M0.0,8.0l4.0,0.0 0.0,-4.0 4.0,0.0 0.0,-4.0 -8.0,0.0z"/>
-    <path
-        android:fillColor="@color/recents_task_bar_dark_icon_color"
-        android:pathData="M4.0,16.0l-4.0,0.0 0.0,8.0 8.0,0.0 0.0,-4.0 -4.0,0.0z"/>
-    <path
-        android:fillColor="@color/recents_task_bar_dark_icon_color"
-        android:pathData="M16.0,0.0l0.0,4.0 4.0,0.0 0.0,4.0 4.0,0.0 0.0,-8.0z"/>
-    <path
-        android:fillColor="@color/recents_task_bar_dark_icon_color"
-        android:pathData="M20.0,20.0l-4.0,0.0 0.0,4.0 8.0,0.0 0.0,-8.0 -4.0,0.0z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+            android:translateX="-252.000000"
+            android:translateY="-602.000000">
+        <group
+                android:translateX="109.000000"
+                android:translateY="514.000000">
+            <group
+                    android:translateX="144.000000"
+                    android:translateY="89.000000">
+                <path
+                    android:strokeColor="@color/recents_task_bar_dark_icon_color"
+                    android:strokeWidth="2"
+                    android:pathData="M17,17 L5,17 L5,5 L17,5 L17,17 Z" />
+            </group>
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_move_task_fullscreen_light.xml b/packages/SystemUI/res/drawable/recents_move_task_fullscreen_light.xml
index f424bf66aeb04..532290637d746 100644
--- a/packages/SystemUI/res/drawable/recents_move_task_fullscreen_light.xml
+++ b/packages/SystemUI/res/drawable/recents_move_task_fullscreen_light.xml
@@ -14,20 +14,24 @@ Copyright (C) 2015 The Android Open Source Project
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/recents_task_bar_light_icon_color"
-        android:pathData="M0.0,8.0l4.0,0.0 0.0,-4.0 4.0,0.0 0.0,-4.0 -8.0,0.0z"/>
-    <path
-        android:fillColor="@color/recents_task_bar_light_icon_color"
-        android:pathData="M4.0,16.0l-4.0,0.0 0.0,8.0 8.0,0.0 0.0,-4.0 -4.0,0.0z"/>
-    <path
-        android:fillColor="@color/recents_task_bar_light_icon_color"
-        android:pathData="M16.0,0.0l0.0,4.0 4.0,0.0 0.0,4.0 4.0,0.0 0.0,-8.0z"/>
-    <path
-        android:fillColor="@color/recents_task_bar_light_icon_color"
-        android:pathData="M20.0,20.0l-4.0,0.0 0.0,4.0 8.0,0.0 0.0,-8.0 -4.0,0.0z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+            android:translateX="-252.000000"
+            android:translateY="-602.000000">
+        <group
+                android:translateX="109.000000"
+                android:translateY="514.000000">
+            <group
+                    android:translateX="144.000000"
+                    android:translateY="89.000000">
+                <path
+                    android:strokeColor="@color/recents_task_bar_light_icon_color"
+                    android:strokeWidth="2"
+                    android:pathData="M19,19 L3,19 L3,3 L19,3 L19,5 L19,18 L19,19 Z" />
+            </group>
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index 231360e46ae97..34720d41b4af9 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -274,6 +274,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
             }
         });
         setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+        if (ssp.hasFreeformWorkspaceSupport()) {
+            setWillNotDraw(false);
+        }
 
         mFreeformWorkspaceBackground = (GradientDrawable) getContext().getDrawable(
                 R.drawable.recents_freeform_workspace_bg);