From 3c5816ab91ebdec6274440f736d97b1cf9588ebd Mon Sep 17 00:00:00 2001
From: Karla Spuldaro <karla.spuldaro@ibm.com>
Date: Thu, 15 Oct 2020 15:47:08 -0400
Subject: [PATCH] Backport PR #9077

Fix toolbar kernel status display on page reload
---
 packages/apputils/src/toolbar.tsx | 32 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/apputils/src/toolbar.tsx b/packages/apputils/src/toolbar.tsx
index a4b1dcba0efc..04e8200848c8 100644
--- a/packages/apputils/src/toolbar.tsx
+++ b/packages/apputils/src/toolbar.tsx
@@ -730,25 +730,21 @@ namespace Private {
 
       const status = sessionContext.kernelDisplayStatus;
 
+      const circleIconProps: LabIcon.IProps = {
+        container: this.node,
+        title: `Kernel ${Text.titleCase(status)}`,
+        stylesheet: 'toolbarButton',
+        alignSelf: 'normal',
+        height: '24px'
+      };
+
       // set the icon
       if (this._isBusy(status)) {
-        circleIcon.element({
-          container: this.node,
-          title: `Kernel ${Text.titleCase(status)}`,
-
-          stylesheet: 'toolbarButton',
-          alignSelf: 'normal',
-          height: '24px'
-        });
+        LabIcon.remove(this.node);
+        circleIcon.element(circleIconProps);
       } else {
-        circleEmptyIcon.element({
-          container: this.node,
-          title: `Kernel ${Text.titleCase(status)}`,
-
-          stylesheet: 'toolbarButton',
-          alignSelf: 'normal',
-          height: '24px'
-        });
+        LabIcon.remove(this.node);
+        circleEmptyIcon.element(circleIconProps);
       }
     }
 
@@ -761,7 +757,9 @@ namespace Private {
         status === 'starting' ||
         status === 'terminating' ||
         status === 'restarting' ||
-        status === 'initializing'
+        status === 'initializing' ||
+        status === 'connecting' ||
+        status === 'unknown'
       );
     }
   }