diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21dabcbb87..3f2b9b4c29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix [#1789](https://github.com/Microsoft/BotFramework-WebChat/issues/1789). Focus send box after message is being sent, by [@corinagum](https://github.com/corinagum) in PR [#1915](https://github.com/Microsoft/BotFramework-WebChat/pull/1915)
 - Fix [#1920](https://github.com/Microsoft/BotFramework-WebChat/issues/1920). Added disabled property to send button, by [@tdurnford](https://github.com/tdurnford) in PR [#1922](https://github.com/Microsoft/BotFramework-WebChat/pull/1922)
 - Fix [#1525](https://github.com/Microsoft/BotFramework-WebChat/issues/1525). Add JavaScript error Offline UI, by [@corinagum](https://github.com/corinagum) in PR [#1927](https://github.com/Microsoft/BotFramework-WebChat/pull/1927)
+- Fix [#1934](https://github.com/Microsoft/BotFramework-WebChat/issues/1934). Fix spacing of empty ConnectivityStatus component, by [@corinagum](https://github.com/corinagum) in PR [#1939](https://github.com/Microsoft/BotFramework-WebChat/pull/1939)
 
 ### Changed
 - Deployment: Bumps to [`blobxfer@1.7.1`](https://github.com/azure/blobxfer/), by [@compulim](https://github.com/compulim), in PR [#1897](https://github.com/Microsoft/BotFramework-WebChat/pull/1897)
diff --git a/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-all-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-all-1-snap.png
index b1bff1ac7c..b8503050d6 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-all-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-all-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-word-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-word-1-snap.png
index ad5165cd0d..9befd16cc2 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-word-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-break-word-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-keep-all-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-keep-all-1-snap.png
index fef81ab8f5..64fe264151 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-keep-all-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/basic-js-long-ur-ls-with-keep-all-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/basic-js-setup-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/basic-js-setup-1-snap.png
index 0264c7ad7e..f373f466d7 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/basic-js-setup-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/basic-js-setup-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/basic-js-unknown-activities-do-not-render-anything-in-the-transcript-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/basic-js-unknown-activities-do-not-render-anything-in-the-transcript-1-snap.png
index 4e037412da..1b71941c1a 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/basic-js-unknown-activities-do-not-render-anything-in-the-transcript-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/basic-js-unknown-activities-do-not-render-anything-in-the-transcript-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-open-url-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-open-url-1-snap.png
index bef048fa25..9af469d374 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-open-url-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-open-url-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-signin-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-signin-1-snap.png
index 7d4763c975..7dd4dd1d07 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-signin-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/card-action-middleware-js-card-action-signin-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-1-snap.png
index 026e29534a..044450e8c7 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png
index 6a0deb8445..967be3b05b 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-1-snap.png
index 0a05c39568..415f0abbe0 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-with-wide-screen-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-with-wide-screen-1-snap.png
index 461a57ad27..b86f359b15 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-with-wide-screen-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-2-attachments-with-wide-screen-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-1-snap.png
index 4664885e6e..91302f54fa 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-2-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-2-snap.png
index 63679c505f..5098783fd3 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-2-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-message-2-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-1-snap.png
index 7045b3058a..d206be292f 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-2-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-2-snap.png
index c6e7a563fc..060777bc13 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-2-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-with-avatar-initials-4-attachments-and-no-message-2-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-1-snap.png
index 35c9140147..1fe297f116 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png
index 006d98d569..baf0a187f8 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-1-snap.png
index c13038ebcb..2dd70665bb 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-with-wide-screen-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-with-wide-screen-1-snap.png
index 489b2a23e0..6ee937521d 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-with-wide-screen-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-2-attachments-with-wide-screen-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-1-snap.png
index 0264c7ad7e..f373f466d7 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-2-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-2-snap.png
index a72518ed50..2ab7dbe39d 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-2-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-message-2-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-1-snap.png
index 321beaecfd..b21f72bb4e 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-2-snap.png b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-2-snap.png
index f76adfe583..f8bc4bbba4 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-2-snap.png and b/__tests__/__image_snapshots__/chrome-docker/carousel-js-carousel-without-avatar-initials-4-attachments-and-no-message-2-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-send-on-enter-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-send-on-enter-1-snap.png
index a27971e754..f50af444d8 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-send-on-enter-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-send-on-enter-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-not-able-to-send-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-not-able-to-send-1-snap.png
index 81060a3039..fff88b7ba7 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-not-able-to-send-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-not-able-to-send-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-sent-but-not-acknowledged-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-sent-but-not-acknowledged-1-snap.png
index f8495514c2..5a8c499df5 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-sent-but-not-acknowledged-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-send-failed-retry-when-activity-is-sent-but-not-acknowledged-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-connection-is-slow-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-connection-is-slow-1-snap.png
index ea7f57a735..1efce9582d 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-connection-is-slow-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-connection-is-slow-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-reconnection-is-slow-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-reconnection-is-slow-1-snap.png
index ea7f57a735..1efce9582d 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-reconnection-is-slow-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-taking-longer-than-usual-to-connect-ui-when-reconnection-is-slow-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-unable-to-connect-ui-when-credentials-are-incorrect-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-unable-to-connect-ui-when-credentials-are-incorrect-1-snap.png
index db06c83d4b..0f8ea375c1 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-unable-to-connect-ui-when-credentials-are-incorrect-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-unable-to-connect-ui-when-credentials-are-incorrect-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/send-box-js-should-focus-send-box-when-message-is-being-sent-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/send-box-js-should-focus-send-box-when-message-is-being-sent-1-snap.png
index 24989cca73..9c502a24ce 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/send-box-js-should-focus-send-box-when-message-is-being-sent-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/send-box-js-should-focus-send-box-when-message-is-being-sent-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-1-snap.png
index 8606080348..8f845d0124 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png
index 3414e6d15b..9c28c6395e 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-1-attachment-with-wide-screen-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-4-attachments-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-4-attachments-1-snap.png
index 5eb53e1cd2..b5a85292f1 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-4-attachments-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-with-avatar-initials-4-attachments-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-1-snap.png
index 4a81aac469..3c74d2a0b5 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png
index b1e62064f9..a684f7af2e 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-1-attachment-with-wide-screen-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-4-attachments-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-4-attachments-1-snap.png
index c21a6bbd2c..86f7675086 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-4-attachments-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/stacked-js-stacked-without-avatar-initials-4-attachments-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-not-show-suggested-actions-not-destined-for-the-user-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-not-show-suggested-actions-not-destined-for-the-user-1-snap.png
index 68d44e981b..8591d1a2f9 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-not-show-suggested-actions-not-destined-for-the-user-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-not-show-suggested-actions-not-destined-for-the-user-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-correctly-formatted-buttons-when-suggested-actions-are-displayed-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-correctly-formatted-buttons-when-suggested-actions-are-displayed-1-snap.png
index 74b63ac727..458b6057c0 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-correctly-formatted-buttons-when-suggested-actions-are-displayed-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-correctly-formatted-buttons-when-suggested-actions-are-displayed-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-imback-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-imback-1-snap.png
index 241b8295da..21d170ee2e 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-imback-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-imback-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-messageback-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-messageback-1-snap.png
index d8f05a7ea1..c1f5e514a7 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-messageback-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-messageback-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-postback-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-postback-1-snap.png
index 43a540802b..d2caa144f6 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-postback-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-no-text-from-user-on-postback-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-messageback-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-messageback-1-snap.png
index d8f05a7ea1..9bbf8db483 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-messageback-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-messageback-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-postback-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-postback-1-snap.png
index 7cfac02f91..c1405861c0 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-postback-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-response-from-bot-and-text-from-user-on-postback-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-images-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-images-1-snap.png
index 892def3013..858709d2c0 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-images-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-images-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-larger-images-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-larger-images-1-snap.png
index 6698253166..0b408e3de0 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-larger-images-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-should-show-suggested-actions-with-larger-images-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/username-js-send-username-in-activity-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/username-js-send-username-in-activity-1-snap.png
index a4bf162d71..53a7519189 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/username-js-send-username-in-activity-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/username-js-send-username-in-activity-1-snap.png differ
diff --git a/packages/component/src/SendBox/ConnectivityStatus.js b/packages/component/src/SendBox/ConnectivityStatus.js
index 4375a77d43..83b6794a7c 100644
--- a/packages/component/src/SendBox/ConnectivityStatus.js
+++ b/packages/component/src/SendBox/ConnectivityStatus.js
@@ -55,51 +55,39 @@ export default connectConnectivityStatus(
   ({ connectivityStatus, language, styleSet }) =>
     <div
       aria-live="polite"
-      className={
-        classNames({
-          [styleSet.errorNotification]:
-            connectivityStatus === 'error'
-            || connectivityStatus === 'notconnected'
-            || connectivityStatus === 'sagaerror',
-          [styleSet.warningNotification]:
-            connectivityStatus === 'connectingslow',
-          [styleSet.connectivityNotification]:
-            connectivityStatus === 'uninitialized'
-            || connectivityStatus === 'connected'
-            || connectivityStatus === 'reconnected'
-            || connectivityStatus === 'reconnecting'
-        })
-      }
       role="status"
     >
       <DebouncedConnectivityStatus
-        interval={ (connectivityStatus === 'uninitialized' || connectivityStatus === 'error') ? 0 : 400 }>
+        interval={ (connectivityStatus === 'uninitialized' || connectivityStatus === 'error') ? 0 : 400 }
+      >
         { () =>
           connectivityStatus === 'connectingslow' ?
-            <React.Fragment>
+            <div className={ styleSet.warningNotification }>
               <WarningNotificationIcon />
               { localize('SLOW_CONNECTION_NOTIFICATION', language) }
-            </React.Fragment>
+            </div>
           : (connectivityStatus === 'error' || connectivityStatus === 'notconnected') ?
-            <React.Fragment>
+            <div className={ styleSet.errorNotification }>
               <ErrorNotificationIcon />
               { localize('FAILED_CONNECTION_NOTIFICATION', language) }
-            </React.Fragment>
+            </div>
           : connectivityStatus === 'uninitialized' ?
-            <React.Fragment>
+            <div className={ styleSet.connectivityNotification }>
               <SpinnerAnimation />
               { localize('INITIAL_CONNECTION_NOTIFICATION', language) }
-            </React.Fragment>
+            </div>
           : connectivityStatus === 'reconnecting' ?
-            <React.Fragment>
+            <div className={ styleSet.connectivityNotification }>
               <SpinnerAnimation />
               { localize('INTERRUPTED_CONNECTION_NOTIFICATION', language) }
-            </React.Fragment>
-          : connectivityStatus === 'sagaerror' &&
-            <React.Fragment>
+            </div>
+          : connectivityStatus === 'sagaerror' ?
+            <div className={ styleSet.errorNotification }>
               <ErrorNotificationIcon />
               { localize('RENDER_ERROR_NOTIFICATION', language) }
-            </React.Fragment>
+            </div>
+          : connectivityStatus === 'reconnected' || connectivityStatus === 'connected' &&
+            false
         }
       </DebouncedConnectivityStatus>
     </div>