diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f1c66a7f6..72f4f78061 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 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)
+- Fix [#1943](https://github.com/Microsoft/BotFramework-WebChat/issues/1943). Fix extra vertical padding in IE11 and Firefox, by [@compulim](https://github.com/compulim) in PR [#XXX](https://github.com/Microsoft/BotFramework-WebChat/pull/XXX)
 
 ### 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 b8503050d6..63a3bbcb45 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 9befd16cc2..de765222c0 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 64fe264151..f3edc33213 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 f373f466d7..516e4a29c8 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 1b71941c1a..fee5b43ea1 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 9af469d374..fb6f24a4cd 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 7dd4dd1d07..2cfedb7e95 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 044450e8c7..7eaf533598 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 967be3b05b..04bf6e349d 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 415f0abbe0..feae154144 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 b86f359b15..8cca6e0a17 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 91302f54fa..dc51f63059 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 5098783fd3..db7d2162cc 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 d206be292f..603ba79d94 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 060777bc13..ea317c3836 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 1fe297f116..519310279d 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 baf0a187f8..e01c1d02ff 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 2dd70665bb..83af1fa8ed 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 6ee937521d..710d6b1270 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 f373f466d7..c8192cd8ba 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 2ab7dbe39d..395128d2e4 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 b21f72bb4e..71e14e2ff5 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 f8bc4bbba4..0344765fb4 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/disabled-ui-js-tests-the-ui-of-disabled-web-chat-change-default-disabled-button-color-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/disabled-ui-js-tests-the-ui-of-disabled-web-chat-change-default-disabled-button-color-1-snap.png
index 267f3ec7ce..3e1f87b0b7 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/disabled-ui-js-tests-the-ui-of-disabled-web-chat-change-default-disabled-button-color-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/disabled-ui-js-tests-the-ui-of-disabled-web-chat-change-default-disabled-button-color-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-multiple-lines-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-multiple-lines-1-snap.png
index 27f17f7cb7..5392b02805 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-multiple-lines-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-multiple-lines-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-resize-after-delete-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-resize-after-delete-1-snap.png
index ba748b153e..46f4295e65 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-resize-after-delete-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-resize-after-delete-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-scroll-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-scroll-1-snap.png
index e9060c634b..dc1ef2a001 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-scroll-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-scroll-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-shift-enter-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-shift-enter-1-snap.png
index f3ff444766..63b3762813 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-shift-enter-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-shift-enter-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-with-whitespace-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-with-whitespace-1-snap.png
index cc17035020..3d800b1861 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-with-whitespace-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/input-js-textarea-input-with-whitespace-1-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 f50af444d8..f89e76c9c9 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-network-interruption-occurred-reconnecting-status-when-connection-is-interrupted-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-network-interruption-occurred-reconnecting-status-when-connection-is-interrupted-1-snap.png
index 9df5649f30..994e348e02 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-network-interruption-occurred-reconnecting-status-when-connection-is-interrupted-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-network-interruption-occurred-reconnecting-status-when-connection-is-interrupted-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 fff88b7ba7..d3ab17ecac 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 5a8c499df5..d5fff28f7b 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-display-the-connecting-connectivity-status-when-connecting-for-the-first-time-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-the-connecting-connectivity-status-when-connecting-for-the-first-time-1-snap.png
index 38358560c0..23149752c6 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-the-connecting-connectivity-status-when-connecting-for-the-first-time-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-display-the-connecting-connectivity-status-when-connecting-for-the-first-time-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-render-error-connectivity-status-when-a-java-script-error-is-present-in-the-code-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-render-error-connectivity-status-when-a-java-script-error-is-present-in-the-code-1-snap.png
index 89692b2332..71e524ba5f 100644
Binary files a/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-render-error-connectivity-status-when-a-java-script-error-is-present-in-the-code-1-snap.png and b/__tests__/__image_snapshots__/chrome-docker/offline-ui-js-offline-ui-should-show-render-error-connectivity-status-when-a-java-script-error-is-present-in-the-code-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 1efce9582d..af4b745ed1 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 1efce9582d..af4b745ed1 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 0f8ea375c1..baaaf24ac0 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 9c502a24ce..e4e81178c9 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 8f845d0124..ba928250dc 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 9c28c6395e..5675f11f22 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 b5a85292f1..7d548b3628 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 3c74d2a0b5..29f45529b6 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 a684f7af2e..ce8875b5e8 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 86f7675086..0ff5ee962e 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 8591d1a2f9..858750c5d9 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 458b6057c0..72e82fe51b 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 21d170ee2e..a3b685182c 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 c1f5e514a7..4a867701d2 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 d2caa144f6..228c81754c 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 9bbf8db483..c20003c7c5 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 c1405861c0..5b3e7ff4d8 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 858709d2c0..0c17103938 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 0b408e3de0..5e23f36e2b 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 53a7519189..4ff479f682 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/BasicSendBox.js b/packages/component/src/BasicSendBox.js
index fe099c4c45..dbbd6f852c 100644
--- a/packages/component/src/BasicSendBox.js
+++ b/packages/component/src/BasicSendBox.js
@@ -55,11 +55,13 @@ const BasicSendBox = ({
         :
           <TextBox className={ TEXT_BOX_CSS } />
       }
-      { (webSpeechPonyfill || {}).SpeechRecognition ?
-          <MicrophoneButton className={ MICROPHONE_BUTTON_CSS } />
-        :
-          <SendButton />
-      }
+      <div>
+        { (webSpeechPonyfill || {}).SpeechRecognition ?
+            <MicrophoneButton className={ MICROPHONE_BUTTON_CSS } />
+          :
+            <SendButton />
+        }
+      </div>
     </div>
   </div>
 
diff --git a/packages/component/src/SendBox/Assets/AttachmentIcon.js b/packages/component/src/SendBox/Assets/AttachmentIcon.js
index 66357560ed..cfc67d0851 100644
--- a/packages/component/src/SendBox/Assets/AttachmentIcon.js
+++ b/packages/component/src/SendBox/Assets/AttachmentIcon.js
@@ -1,20 +1,10 @@
-import { css } from 'glamor';
 import React from 'react';
 
-const ROOT_CSS = css({
-  height: 28,
-  overflow: 'hidden',
-  padding: 6,
-  width: 28
-});
-
 export default () =>
-  <div className={ ROOT_CSS }>
-    <svg
-      height={ 28 }
-      viewBox="0 0 25.75 46"
-      width={ 28 }
-    >
-      <path d="M20.75 11.75v21.37a7.69 7.69 0 0 1-.62 3.07 7.95 7.95 0 0 1-4.19 4.19 7.89 7.89 0 0 1-6.13 0 7.95 7.95 0 0 1-4.19-4.19 7.69 7.69 0 0 1-.62-3.07v-22.5a5.27 5.27 0 0 1 .45-2.17 5.69 5.69 0 0 1 3-3 5.48 5.48 0 0 1 4.35 0 5.69 5.69 0 0 1 3 3 5.27 5.27 0 0 1 .45 2.17v22.5a3.41 3.41 0 0 1-.26 1.32 3.31 3.31 0 0 1-1.8 1.8 3.46 3.46 0 0 1-2.63 0 3.31 3.31 0 0 1-1.8-1.8 3.41 3.41 0 0 1-.26-1.32V14h2.25v19.12a1.13 1.13 0 1 0 2.25 0v-22.5a3.4 3.4 0 0 0-.26-1.31 3.31 3.31 0 0 0-1.8-1.8 3.46 3.46 0 0 0-2.63 0 3.31 3.31 0 0 0-1.8 1.8 3.4 3.4 0 0 0-.26 1.31v22.5a5.32 5.32 0 0 0 .45 2.18 5.69 5.69 0 0 0 3 3 5.48 5.48 0 0 0 4.35 0 5.69 5.69 0 0 0 3-3 5.32 5.32 0 0 0 .45-2.18v-21.37z" clipRule="evenodd" />
-    </svg>
-  </div>
+  <svg
+    height={ 28 }
+    viewBox="0 0 25.75 46"
+    width={ 28 }
+  >
+    <path d="M20.75 11.75v21.37a7.69 7.69 0 0 1-.62 3.07 7.95 7.95 0 0 1-4.19 4.19 7.89 7.89 0 0 1-6.13 0 7.95 7.95 0 0 1-4.19-4.19 7.69 7.69 0 0 1-.62-3.07v-22.5a5.27 5.27 0 0 1 .45-2.17 5.69 5.69 0 0 1 3-3 5.48 5.48 0 0 1 4.35 0 5.69 5.69 0 0 1 3 3 5.27 5.27 0 0 1 .45 2.17v22.5a3.41 3.41 0 0 1-.26 1.32 3.31 3.31 0 0 1-1.8 1.8 3.46 3.46 0 0 1-2.63 0 3.31 3.31 0 0 1-1.8-1.8 3.41 3.41 0 0 1-.26-1.32V14h2.25v19.12a1.13 1.13 0 1 0 2.25 0v-22.5a3.4 3.4 0 0 0-.26-1.31 3.31 3.31 0 0 0-1.8-1.8 3.46 3.46 0 0 0-2.63 0 3.31 3.31 0 0 0-1.8 1.8 3.4 3.4 0 0 0-.26 1.31v22.5a5.32 5.32 0 0 0 .45 2.18 5.69 5.69 0 0 0 3 3 5.48 5.48 0 0 0 4.35 0 5.69 5.69 0 0 0 3-3 5.32 5.32 0 0 0 .45-2.18v-21.37z" clipRule="evenodd" />
+  </svg>
diff --git a/packages/component/src/SendBox/Assets/MicrophoneIcon.js b/packages/component/src/SendBox/Assets/MicrophoneIcon.js
index b0445a0db7..af80ea3a94 100644
--- a/packages/component/src/SendBox/Assets/MicrophoneIcon.js
+++ b/packages/component/src/SendBox/Assets/MicrophoneIcon.js
@@ -1,23 +1,10 @@
-import { css } from 'glamor';
-import classNames from 'classnames';
 import React from 'react';
 
-const ROOT_CSS = css({
-  height: 28,
-  overflow: 'hidden',
-  padding: 6,
-  width: 28
-});
-
-export default ({ className }) =>
-  <div
-    className={ classNames((className || '') + '', ROOT_CSS) }
+export default () =>
+  <svg
+    height={ 28 }
+    viewBox="0 0 34.75 46"
+    width={ 28 }
   >
-    <svg
-      height={ 28 }
-      viewBox="0 0 34.75 46"
-      width={ 28 }
-    >
-      <path className="a" d="M29.75,23v6.36a7,7,0,0,1-.56,2.78,7.16,7.16,0,0,1-3.8,3.8,7,7,0,0,1-2.78.56H18.5v2.25H23V41H11.75v-2.25h4.5V36.5h-4.11a7,7,0,0,1-2.78-.56,7.16,7.16,0,0,1-3.8-3.8,7,7,0,0,1-.56-2.78V23h2.25v6.36a4.72,4.72,0,0,0,.39,1.9,4.78,4.78,0,0,0,2.6,2.6,4.72,4.72,0,0,0,1.9.39h10.47a4.72,4.72,0,0,0,1.9-.39,4.78,4.78,0,0,0,2.6-2.6,4.72,4.72,0,0,0,.39-1.9V23Zm-18,5.62a1.13,1.13,0,0,0,1.13,1.13h9a1.13,1.13,0,0,0,1.12-1.13V8.38a1.13,1.13,0,0,0-1.12-1.13h-9a1.13,1.13,0,0,0-1.13,1.13Zm1.13,3.38a3.41,3.41,0,0,1-1.32-.26,3.31,3.31,0,0,1-1.8-1.8,3.41,3.41,0,0,1-.26-1.32V8.38a3.41,3.41,0,0,1,.26-1.32,3.31,3.31,0,0,1,1.8-1.8,3.41,3.41,0,0,1,1.32-.26h9a3.4,3.4,0,0,1,1.31.26,3.31,3.31,0,0,1,1.8,1.8,3.41,3.41,0,0,1,.26,1.32v20.24a3.41,3.41,0,0,1-.26,1.32,3.31,3.31,0,0,1-1.8,1.8,3.4,3.4,0,0,1-1.31.26Z" />
-    </svg>
-  </div>
+    <path className="a" d="M29.75,23v6.36a7,7,0,0,1-.56,2.78,7.16,7.16,0,0,1-3.8,3.8,7,7,0,0,1-2.78.56H18.5v2.25H23V41H11.75v-2.25h4.5V36.5h-4.11a7,7,0,0,1-2.78-.56,7.16,7.16,0,0,1-3.8-3.8,7,7,0,0,1-.56-2.78V23h2.25v6.36a4.72,4.72,0,0,0,.39,1.9,4.78,4.78,0,0,0,2.6,2.6,4.72,4.72,0,0,0,1.9.39h10.47a4.72,4.72,0,0,0,1.9-.39,4.78,4.78,0,0,0,2.6-2.6,4.72,4.72,0,0,0,.39-1.9V23Zm-18,5.62a1.13,1.13,0,0,0,1.13,1.13h9a1.13,1.13,0,0,0,1.12-1.13V8.38a1.13,1.13,0,0,0-1.12-1.13h-9a1.13,1.13,0,0,0-1.13,1.13Zm1.13,3.38a3.41,3.41,0,0,1-1.32-.26,3.31,3.31,0,0,1-1.8-1.8,3.41,3.41,0,0,1-.26-1.32V8.38a3.41,3.41,0,0,1,.26-1.32,3.31,3.31,0,0,1,1.8-1.8,3.41,3.41,0,0,1,1.32-.26h9a3.4,3.4,0,0,1,1.31.26,3.31,3.31,0,0,1,1.8,1.8,3.41,3.41,0,0,1,.26,1.32v20.24a3.41,3.41,0,0,1-.26,1.32,3.31,3.31,0,0,1-1.8,1.8,3.4,3.4,0,0,1-1.31.26Z" />
+  </svg>
diff --git a/packages/component/src/SendBox/Assets/SendIcon.js b/packages/component/src/SendBox/Assets/SendIcon.js
index ad9cc01c92..360d2c42db 100644
--- a/packages/component/src/SendBox/Assets/SendIcon.js
+++ b/packages/component/src/SendBox/Assets/SendIcon.js
@@ -1,20 +1,10 @@
-import { css } from 'glamor';
 import React from 'react';
 
-const ROOT_CSS = css({
-  height: 28,
-  overflow: 'hidden',
-  padding: 6,
-  width: 28
-});
-
 export default () =>
-  <div className={ ROOT_CSS }>
-    <svg
-      height={ 28 }
-      viewBox="0 0 45.7 33.8"
-      width={ 28 }
-    >
-      <path d="M8.55 25.25l21.67-7.25H11zm2.41-9.47h19.26l-21.67-7.23zm-6 13l4-11.9L5 5l35.7 11.9z" clipRule="evenodd" />
-    </svg>
-  </div>
+  <svg
+    height={ 28 }
+    viewBox="0 0 45.7 33.8"
+    width={ 28 }
+  >
+    <path d="M8.55 25.25l21.67-7.25H11zm2.41-9.47h19.26l-21.67-7.23zm-6 13l4-11.9L5 5l35.7 11.9z" clipRule="evenodd" />
+  </svg>
diff --git a/packages/component/src/SendBox/SendButton.js b/packages/component/src/SendBox/SendButton.js
index 2fd325fc05..4aede5f105 100644
--- a/packages/component/src/SendBox/SendButton.js
+++ b/packages/component/src/SendBox/SendButton.js
@@ -1,8 +1,8 @@
 import React from 'react';
 
+import { localize } from '../Localization/Localize';
 import connectToWebChat from '../connectToWebChat';
 import IconButton from './IconButton';
-import { localize } from '../Localization/Localize';
 import SendIcon from './Assets/SendIcon';
 
 const connectSendButton = (...selectors) => connectToWebChat(
@@ -27,15 +27,13 @@ const connectSendButton = (...selectors) => connectToWebChat(
 
 export default connectSendButton()(
   ({ click, disabled, language }) =>
-    <div>
-      <IconButton
-        alt={ localize('Send', language) }
-        disabled={ disabled }
-        onClick={ click }
-      >
-        <SendIcon />
-      </IconButton>
-    </div>
+    <IconButton
+      alt={ localize('Send', language) }
+      disabled={ disabled }
+      onClick={ click }
+    >
+      <SendIcon />
+    </IconButton>
 )
 
 export { connectSendButton }
diff --git a/packages/component/src/SendBox/UploadButton.js b/packages/component/src/SendBox/UploadButton.js
index 17e308b735..07ecfbd479 100644
--- a/packages/component/src/SendBox/UploadButton.js
+++ b/packages/component/src/SendBox/UploadButton.js
@@ -55,7 +55,7 @@ class UploadButton extends React.Component {
     this.inputRef = React.createRef();
   }
 
-  handleClick(event) {
+  handleClick() {
     const { current } = this.inputRef;
 
     current && current.click();
diff --git a/packages/component/src/Styles/StyleSet/SendBox.js b/packages/component/src/Styles/StyleSet/SendBox.js
index c89f6d15e2..9ee776c330 100644
--- a/packages/component/src/Styles/StyleSet/SendBox.js
+++ b/packages/component/src/Styles/StyleSet/SendBox.js
@@ -8,6 +8,7 @@ export default function createSendBoxStyle({
 }) {
   return {
     '& > .main': {
+      alignItems: 'stretch',
       backgroundColor: sendBoxBackground,
       borderBottom: sendBoxBorderBottom,
       borderLeft: sendBoxBorderLeft,