diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java
index 49dfe46..08857b7 100644
--- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java
@@ -130,6 +130,8 @@
         applyThumbnail(mThumbnailView2, task2, thumbnailUpdateFunction);
 
         if (iconUpdateFunction == null) {
+            applyIcon(mIcon1, task1);
+            applyIcon(mIcon2, task2);
             setContentDescription(task2 == null
                     ? task1.titleDescription
                     : getContext().getString(
@@ -183,8 +185,8 @@
         thumbnailView.setImageBitmap(bm);
     }
 
-    private void applyIcon(@Nullable ImageView iconView, @NonNull Task task) {
-        if (iconView == null) {
+    private void applyIcon(@Nullable ImageView iconView, @Nullable Task task) {
+        if (iconView == null || task == null) {
             return;
         }
         iconView.setVisibility(VISIBLE);