You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by vo...@apache.org on 2022/04/04 17:34:29 UTC

[druid] branch master updated: Blueprint 4 (#12391)

This is an automated email from the ASF dual-hosted git repository.

vogievetsky pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new 90680543d0 Blueprint 4 (#12391)
90680543d0 is described below

commit 90680543d0086a7692101072cf804241f5a883dd
Author: John Gozde <jo...@gozde.ca>
AuthorDate: Mon Apr 4 11:34:22 2022 -0600

    Blueprint 4 (#12391)
    
    * Update blueprint dependencies & LICENSES
    
    * Switch to bp4 namespace; use bp-ns variable in overrides
    
    * Add webpack alias for colors.scss
    
    * Snapshots
    
    * Update selectors in e2e tests
---
 licenses.yaml                                      | 206 +++++++--
 licenses/bin/@types-dom4.MIT                       |   2 +-
 licenses/bin/camel-case.MIT                        |  21 +
 licenses/bin/capital-case.MIT                      |  21 +
 licenses/bin/change-case.MIT                       |  21 +
 licenses/bin/constant-case.MIT                     |  21 +
 licenses/bin/dot-case.MIT                          |  21 +
 licenses/bin/header-case.MIT                       |  21 +
 licenses/bin/lower-case.MIT                        |  21 +
 licenses/bin/no-case.MIT                           |  21 +
 licenses/bin/param-case.MIT                        |  21 +
 licenses/bin/pascal-case.MIT                       |  21 +
 licenses/bin/path-case.MIT                         |  21 +
 licenses/bin/sentence-case.MIT                     |  21 +
 licenses/bin/snake-case.MIT                        |  21 +
 licenses/bin/upper-case-first.MIT                  |  21 +
 licenses/bin/upper-case.MIT                        |  21 +
 .../e2e-tests/component/datasources/overview.ts    |   2 +-
 .../e2e-tests/component/load-data/data-loader.ts   |   4 +-
 web-console/package-lock.json                      | 285 ++++++++----
 web-console/package.json                           |   8 +-
 web-console/script/licenses                        |   1 +
 .../src/blueprint-overrides/common/_variables.scss |   2 +-
 web-console/src/bootstrap/ace.scss                 |   4 +-
 .../bootstrap/react-table-custom-pagination.scss   |  11 +-
 .../__snapshots__/action-cell.spec.tsx.snap        |   6 +-
 .../__snapshots__/action-icon.spec.tsx.snap        |   6 +-
 .../__snapshots__/array-input.spec.tsx.snap        |  14 +-
 .../__snapshots__/auto-form.spec.tsx.snap          |  32 +-
 .../src/components/auto-form/auto-form.scss        |   6 +-
 .../__snapshots__/clearable-input.spec.tsx.snap    |  15 +-
 .../date-range-selector/date-range-selector.scss   |   4 +-
 .../form-group-with-info.spec.tsx.snap             |  17 +-
 .../form-group-with-info/form-group-with-info.scss |   6 +-
 .../__snapshots__/form-json-selector.spec.tsx.snap |  24 +-
 .../__snapshots__/formatted-input.spec.tsx.snap    |  10 +-
 .../formatted-input/formatted-input.scss           |   4 +-
 .../__snapshots__/header-bar.spec.tsx.snap         | 107 +++--
 .../src/components/header-bar/header-bar.scss      |  14 +-
 .../__snapshots__/interval-input.spec.tsx.snap     |  17 +-
 .../__snapshots__/json-collapse.spec.tsx.snap      |   8 +-
 .../__snapshots__/menu-checkbox.spec.tsx.snap      |  76 ++--
 .../__snapshots__/more-button.spec.tsx.snap        |  24 +-
 .../numeric-input-with-default.spec.tsx.snap       |   2 +-
 .../__snapshots__/rule-editor.spec.tsx.snap        | 489 ++++++++++-----------
 .../__snapshots__/segment-timeline.spec.tsx.snap   |  57 ++-
 .../src/components/show-history/show-history.scss  |   6 +-
 .../__snapshots__/show-json.spec.tsx.snap          |  14 +-
 .../show-log/__snapshots__/show-log.spec.tsx.snap  |  18 +-
 .../__snapshots__/show-value.spec.tsx.snap         |   8 +-
 .../__snapshots__/suggestible-input.spec.tsx.snap  |  36 +-
 .../__snapshots__/suggestion-menu.spec.tsx.snap    |  32 +-
 .../supervisor-statistics-table.spec.tsx.snap      |  30 +-
 .../__snapshots__/table-cell.spec.tsx.snap         |  12 +-
 .../table-column-selector.spec.tsx.snap            |  13 +-
 .../table-column-selector.scss                     |   4 +-
 .../__snapshots__/timed-button.spec.tsx.snap       |  23 +-
 .../view-control-bar/view-control-bar.scss         |   4 +-
 .../__snapshots__/warning-checklist.spec.tsx.snap  |  12 +-
 .../__snapshots__/about-dialog.spec.tsx.snap       |  55 ++-
 .../async-action-dialog.spec.tsx.snap              |  34 +-
 .../__snapshots__/compaction-dialog.spec.tsx.snap  |  54 +--
 .../compaction-dialog/compaction-dialog.scss       |   4 +-
 .../coordinator-dynamic-config-dialog.scss         |   6 +-
 .../datasource-table-action-dialog.spec.tsx.snap   |  74 ++--
 .../src/dialogs/diff-dialog/diff-dialog.scss       |   4 +-
 .../__snapshots__/doctor-dialog.spec.tsx.snap      |  58 +--
 .../src/dialogs/doctor-dialog/doctor-dialog.scss   |   6 +-
 .../edit-context-dialog.spec.tsx.snap              |  46 +-
 .../edit-context-dialog/edit-context-dialog.scss   |   8 +-
 .../__snapshots__/history-dialog.spec.tsx.snap     |  89 ++--
 .../src/dialogs/history-dialog/history-dialog.scss |   8 +-
 .../__snapshots__/lookup-edit-dialog.spec.tsx.snap |  30 +-
 .../lookup-edit-dialog/lookup-edit-dialog.scss     |   4 +-
 .../lookup-table-action-dialog.spec.tsx.snap       |  74 ++--
 .../overlord-dynamic-config-dialog.scss            |   6 +-
 .../query-history-dialog.spec.tsx.snap             |  44 +-
 .../query-history-dialog/query-history-dialog.scss |   4 +-
 .../__snapshots__/retention-dialog.spec.tsx.snap   | 215 ++++-----
 .../dialogs/retention-dialog/retention-dialog.scss |   6 +-
 .../segment-table-action-dialog.spec.tsx.snap      |  88 ++--
 .../__snapshots__/show-value-dialog.spec.tsx.snap  |  53 ++-
 .../show-value-dialog/show-value-dialog.scss       |  12 +-
 .../__snapshots__/snitch-dialog.spec.tsx.snap      | 106 +++--
 .../src/dialogs/snitch-dialog/snitch-dialog.scss   |   4 +-
 .../__snapshots__/spec-dialog.spec.tsx.snap        |  94 ++--
 .../src/dialogs/spec-dialog/spec-dialog.scss       |   4 +-
 .../__snapshots__/status-dialog.spec.tsx.snap      |  46 +-
 .../src/dialogs/status-dialog/status-dialog.scss   |   9 +-
 .../supervisor-table-action-dialog.spec.tsx.snap   | 118 +++--
 .../table-action-dialog.spec.tsx.snap              |  54 ++-
 .../table-action-dialog/table-action-dialog.scss   |  12 +-
 .../task-table-action-dialog.spec.tsx.snap         | 118 +++--
 web-console/src/entry.scss                         |   2 +-
 web-console/src/variables.scss                     |   3 +-
 .../__snapshots__/datasource-view.spec.tsx.snap    |  16 +-
 .../__snapshots__/datasources-card.spec.tsx.snap   |  10 +-
 .../__snapshots__/home-view-card.spec.tsx.snap     |  10 +-
 .../home-view/home-view-card/home-view-card.scss   |   6 +-
 .../__snapshots__/lookups-card.spec.tsx.snap       |  10 +-
 .../__snapshots__/segments-card.spec.tsx.snap      |  10 +-
 .../__snapshots__/services-card.spec.tsx.snap      |  10 +-
 .../__snapshots__/status-card.spec.tsx.snap        |  10 +-
 .../__snapshots__/supervisors-card.spec.tsx.snap   |  10 +-
 .../__snapshots__/tasks-card.spec.tsx.snap         |  10 +-
 .../__snapshots__/ingestion-view.spec.tsx.snap     |  56 ++-
 .../__snapshots__/load-data-view.spec.tsx.snap     |  48 +-
 .../__snapshots__/example-picker.spec.tsx.snap     |  14 +-
 .../__snapshots__/form-editor.spec.tsx.snap        |  38 +-
 .../load-data-view/form-editor/form-editor.scss    |   3 +-
 .../src/views/load-data-view/load-data-view.scss   |   7 +-
 .../__snapshots__/lookups-view.spec.tsx.snap       |   2 +-
 .../__snapshots__/query-view.spec.tsx.snap         |  12 +-
 .../__snapshots__/column-tree.spec.tsx.snap        |  22 +-
 .../__snapshots__/number-menu-items.spec.tsx.snap  | 326 +++++++-------
 .../__snapshots__/string-menu-items.spec.tsx.snap  | 326 +++++++-------
 .../__snapshots__/time-menu-items.spec.tsx.snap    | 326 +++++++-------
 .../views/query-view/column-tree/column-tree.scss  |   6 +-
 .../__snapshots__/explain-dialog.spec.tsx.snap     | 110 ++---
 .../query-view/explain-dialog/explain-dialog.scss  |  12 +-
 .../live-query-mode-selector.spec.tsx.snap         |  50 ++-
 .../live-query-mode-selector.scss                  |   4 +-
 .../views/query-view/query-error/query-error.scss  |   3 +-
 .../__snapshots__/query-extra-info.spec.tsx.snap   |  15 +-
 .../__snapshots__/query-output.spec.tsx.snap       |  84 ++--
 .../column-rename-input.spec.tsx.snap              |   2 +-
 .../query-view/query-output/query-output.scss      |   4 +-
 .../__snapshots__/query-timer.spec.tsx.snap        |   9 +-
 web-console/src/views/query-view/query-view.scss   |   2 +-
 .../__snapshots__/run-button.spec.tsx.snap         |  50 +--
 .../__snapshots__/segments-view.spec.tsx.snap      |  18 +-
 .../__snapshots__/services-view.spec.tsx.snap      |  20 +-
 web-console/unified-console.html                   |   2 +-
 web-console/webpack.config.js                      |   9 +
 134 files changed, 3054 insertions(+), 2170 deletions(-)

diff --git a/licenses.yaml b/licenses.yaml
index 092ba77e50..acbc5c4117 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -5098,12 +5098,21 @@ license_file_path: licenses/bin/@babel-types.MIT
 
 ---
 
+name: "@blueprintjs/colors"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Palantir Technologies
+version: 4.0.1
+
+---
+
 name: "@blueprintjs/core"
 license_category: binary
 module: web-console
 license_name: Apache License version 2.0
 copyright: Palantir Technologies
-version: 3.45.0
+version: 4.0.3
 
 ---
 
@@ -5112,7 +5121,7 @@ license_category: binary
 module: web-console
 license_name: Apache License version 2.0
 copyright: Palantir Technologies
-version: 3.23.4
+version: 4.0.3
 
 ---
 
@@ -5121,7 +5130,7 @@ license_category: binary
 module: web-console
 license_name: Apache License version 2.0
 copyright: Palantir Technologies
-version: 3.31.0
+version: 4.1.1
 
 ---
 
@@ -5130,7 +5139,7 @@ license_category: binary
 module: web-console
 license_name: Apache License version 2.0
 copyright: Palantir Technologies
-version: 0.10.1
+version: 1.0.3
 
 ---
 
@@ -5234,12 +5243,21 @@ license_file_path: licenses/bin/@hypnosphi-create-react-context.MIT
 
 ---
 
+name: "@juggle/resize-observer"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Juggle
+version: 3.3.1
+
+---
+
 name: "@popperjs/core"
 license_category: binary
 module: web-console
 license_name: MIT License
 copyright: Federico Zivolo
-version: 2.9.2
+version: 2.11.4
 license_file_path: licenses/bin/@popperjs-core.MIT
 
 ---
@@ -5249,7 +5267,7 @@ license_category: binary
 module: web-console
 license_name: MIT License
 copyright: Microsoft Corporation.
-version: 2.0.1
+version: 2.0.2
 license_file_path: licenses/bin/@types-dom4.MIT
 
 ---
@@ -5334,6 +5352,26 @@ license_file_path: licenses/bin/callsites.MIT
 
 ---
 
+name: "camel-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 4.1.2
+license_file_path: licenses/bin/camel-case.MIT
+
+---
+
+name: "capital-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 1.0.4
+license_file_path: licenses/bin/capital-case.MIT
+
+---
+
 name: "chalk"
 license_category: binary
 module: web-console
@@ -5344,6 +5382,16 @@ license_file_path: licenses/bin/chalk.MIT
 
 ---
 
+name: "change-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 4.1.2
+license_file_path: licenses/bin/change-case.MIT
+
+---
+
 name: "classnames"
 license_category: binary
 module: web-console
@@ -5374,6 +5422,16 @@ license_file_path: licenses/bin/color-name.MIT
 
 ---
 
+name: "constant-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.0.4
+license_file_path: licenses/bin/constant-case.MIT
+
+---
+
 name: "convert-source-map"
 license_category: binary
 module: web-console
@@ -5568,7 +5626,7 @@ license_category: binary
 module: web-console
 license_name: MIT License
 copyright: Jason Quense
-version: 3.4.0
+version: 5.2.1
 license_file_path: licenses/bin/dom-helpers.MIT
 
 ---
@@ -5583,6 +5641,16 @@ license_file_path: licenses/bin/dom4.MIT
 
 ---
 
+name: "dot-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.0.4
+license_file_path: licenses/bin/dot-case.MIT
+
+---
+
 name: "druid-query-toolkit"
 license_category: binary
 module: web-console
@@ -5722,6 +5790,16 @@ license_file_path: licenses/bin/has.MIT
 
 ---
 
+name: "header-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 2.0.4
+license_file_path: licenses/bin/header-case.MIT
+
+---
+
 name: "history"
 license_category: binary
 module: web-console
@@ -5902,6 +5980,16 @@ license_file_path: licenses/bin/loose-envify.MIT
 
 ---
 
+name: "lower-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 2.0.2
+license_file_path: licenses/bin/lower-case.MIT
+
+---
+
 name: "memoize-one"
 license_category: binary
 module: web-console
@@ -5922,6 +6010,16 @@ license_file_path: licenses/bin/mini-create-react-context.MIT
 
 ---
 
+name: "no-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.0.4
+license_file_path: licenses/bin/no-case.MIT
+
+---
+
 name: "normalize.css"
 license_category: binary
 module: web-console
@@ -5981,6 +6079,16 @@ version: 1.101.0
 
 ---
 
+name: "param-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.0.4
+license_file_path: licenses/bin/param-case.MIT
+
+---
+
 name: "parent-module"
 license_category: binary
 module: web-console
@@ -6001,6 +6109,26 @@ license_file_path: licenses/bin/parse-json.MIT
 
 ---
 
+name: "pascal-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.1.2
+license_file_path: licenses/bin/pascal-case.MIT
+
+---
+
+name: "path-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.0.4
+license_file_path: licenses/bin/path-case.MIT
+
+---
+
 name: "path-parse"
 license_category: binary
 module: web-console
@@ -6111,16 +6239,6 @@ license_file_path: licenses/bin/react-is.MIT
 
 ---
 
-name: "react-lifecycles-compat"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Facebook, Inc.
-version: 3.0.4
-license_file_path: licenses/bin/react-lifecycles-compat.MIT
-
----
-
 name: "react-popper"
 license_category: binary
 module: web-console
@@ -6176,7 +6294,7 @@ license_category: binary
 module: web-console
 license_name: BSD-3-Clause License
 copyright: React Community
-version: 2.9.0
+version: 4.4.2
 license_file_path: licenses/bin/react-transition-group.BSD3
 
 ---
@@ -6211,16 +6329,6 @@ license_file_path: licenses/bin/regexp.prototype.flags.MIT
 
 ---
 
-name: "resize-observer-polyfill"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Denis Rul
-version: 1.5.1
-license_file_path: licenses/bin/resize-observer-polyfill.MIT
-
----
-
 name: "resolve-from"
 license_category: binary
 module: web-console
@@ -6271,6 +6379,26 @@ license_file_path: licenses/bin/scheduler.MIT
 
 ---
 
+name: "sentence-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.0.4
+license_file_path: licenses/bin/sentence-case.MIT
+
+---
+
+name: "snake-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 3.0.4
+license_file_path: licenses/bin/snake-case.MIT
+
+---
+
 name: "source-map"
 license_category: binary
 module: web-console
@@ -6336,7 +6464,7 @@ license_category: binary
 module: web-console
 license_name: Zero-Clause BSD
 copyright: Microsoft Corp.
-version: 1.13.0
+version: 2.3.1
 license_file_path: licenses/bin/tslib.0BSD
 
 ---
@@ -6351,6 +6479,26 @@ license_file_path: licenses/bin/typed-styles.MIT
 
 ---
 
+name: "upper-case-first"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 2.0.2
+license_file_path: licenses/bin/upper-case-first.MIT
+
+---
+
+name: "upper-case"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Blake Embrey
+version: 2.0.2
+license_file_path: licenses/bin/upper-case.MIT
+
+---
+
 name: "value-equal"
 license_category: binary
 module: web-console
diff --git a/licenses/bin/@types-dom4.MIT b/licenses/bin/@types-dom4.MIT
old mode 100644
new mode 100755
index 21071075c2..9e841e7a26
--- a/licenses/bin/@types-dom4.MIT
+++ b/licenses/bin/@types-dom4.MIT
@@ -1,6 +1,6 @@
     MIT License
 
-    Copyright (c) Microsoft Corporation. All rights reserved.
+    Copyright (c) Microsoft Corporation.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
diff --git a/licenses/bin/camel-case.MIT b/licenses/bin/camel-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/camel-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/capital-case.MIT b/licenses/bin/capital-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/capital-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/change-case.MIT b/licenses/bin/change-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/change-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/constant-case.MIT b/licenses/bin/constant-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/constant-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/dot-case.MIT b/licenses/bin/dot-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/dot-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/header-case.MIT b/licenses/bin/header-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/header-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/lower-case.MIT b/licenses/bin/lower-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/lower-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/no-case.MIT b/licenses/bin/no-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/no-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/param-case.MIT b/licenses/bin/param-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/param-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/pascal-case.MIT b/licenses/bin/pascal-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/pascal-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/path-case.MIT b/licenses/bin/path-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/path-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/sentence-case.MIT b/licenses/bin/sentence-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/sentence-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/snake-case.MIT b/licenses/bin/snake-case.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/snake-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/upper-case-first.MIT b/licenses/bin/upper-case-first.MIT
new file mode 100644
index 0000000000..983fbe8aec
--- /dev/null
+++ b/licenses/bin/upper-case-first.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/licenses/bin/upper-case.MIT b/licenses/bin/upper-case.MIT
new file mode 100644
index 0000000000..dcd4d73690
--- /dev/null
+++ b/licenses/bin/upper-case.MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/web-console/e2e-tests/component/datasources/overview.ts b/web-console/e2e-tests/component/datasources/overview.ts
index 8dafb56070..660d22cfdf 100644
--- a/web-console/e2e-tests/component/datasources/overview.ts
+++ b/web-console/e2e-tests/component/datasources/overview.ts
@@ -130,7 +130,7 @@ export class DatasourcesOverview {
   }
 
   private async waitForPopupMenu(): Promise<void> {
-    await this.page.waitForSelector('ul.bp3-menu');
+    await this.page.waitForSelector('ul.bp4-menu');
   }
 
   async triggerCompaction(): Promise<void> {
diff --git a/web-console/e2e-tests/component/load-data/data-loader.ts b/web-console/e2e-tests/component/load-data/data-loader.ts
index 4d42650b52..7bc1837f61 100644
--- a/web-console/e2e-tests/component/load-data/data-loader.ts
+++ b/web-console/e2e-tests/component/load-data/data-loader.ts
@@ -58,7 +58,7 @@ export class DataLoader {
   }
 
   private async start() {
-    const cardSelector = `//*[contains(@class,"bp3-card")][p[contains(text(),"${this.connector.name}")]]`;
+    const cardSelector = `//*[contains(@class,"bp4-card")][p[contains(text(),"${this.connector.name}")]]`;
     await this.page.click(cardSelector);
     await clickButton(this.page, 'Connect data');
   }
@@ -118,7 +118,7 @@ export class DataLoader {
     const rollupChecked = await rollupInput!.evaluate(el => (el as HTMLInputElement).checked);
     if (rollupChecked !== configureSchemaConfig.rollup) {
       await this.page.click(rollupSelector);
-      const confirmationDialogSelector = '//*[contains(@class,"bp3-alert-body")]';
+      const confirmationDialogSelector = '//*[contains(@class,"bp4-alert-body")]';
       await this.page.waitForSelector(confirmationDialogSelector);
       await clickButton(this.page, 'Yes');
       const statusMessageSelector = '.recipe-toaster';
diff --git a/web-console/package-lock.json b/web-console/package-lock.json
index 46ec940322..4f747b7c04 100644
--- a/web-console/package-lock.json
+++ b/web-console/package-lock.json
@@ -3210,78 +3210,62 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "@blueprintjs/colors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.1.tgz",
+      "integrity": "sha512-w2kMtUzQjHdrmjXpUnCfTq7/pc41S4UnXzOp6+AZtzCR4cVG1r2yBWR4XxaAAecDb94/yIBXooqtMD0B8T1Y2w=="
+    },
     "@blueprintjs/core": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-3.45.0.tgz",
-      "integrity": "sha512-oLknlh+jdvdat+3JrljKGAmtP7KJRKnUqWJOvcGHmAlE2nUZkwzI1jICd2HMncQrukIqQN5ORZK1tswus6BM+Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.0.3.tgz",
+      "integrity": "sha512-3yLiBAuBTnBneqSc2eqiMGhhcxwUcCLpUu8PLDfpsBLi4AjO9zHyfcmAupxpV49KlKpDJrntGq6jltDvQDXLtQ==",
       "requires": {
-        "@blueprintjs/icons": "^3.26.1",
+        "@blueprintjs/colors": "^4.0.1",
+        "@blueprintjs/icons": "^4.1.1",
+        "@juggle/resize-observer": "^3.3.1",
         "@types/dom4": "^2.0.1",
         "classnames": "^2.2",
         "dom4": "^2.1.5",
         "normalize.css": "^8.0.1",
         "popper.js": "^1.16.1",
-        "react-lifecycles-compat": "^3.0.4",
         "react-popper": "^1.3.7",
-        "react-transition-group": "^2.9.0",
-        "resize-observer-polyfill": "^1.5.1",
-        "tslib": "~1.13.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-        }
+        "react-transition-group": "^4.4.1",
+        "tslib": "~2.3.1"
       }
     },
     "@blueprintjs/datetime": {
-      "version": "3.23.4",
-      "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-3.23.4.tgz",
-      "integrity": "sha512-tC0DH6jKMLdZjXlAH7UoP3gzTjCm8iYKGY9jMyqPqTj869AJHnqW5NlCZKp+xMiy6FJ53oJjjKdhw6l5p46BZA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.0.3.tgz",
+      "integrity": "sha512-kmxzUoiYYMyscn4y3YM7kwUI3cQZ4eNS3mYH69lc2QNsuxT0g2H6WbFlYBP4hF8XDRgqBlv1Mi2/HDsRRBQHBQ==",
       "requires": {
-        "@blueprintjs/core": "^3.45.0",
+        "@blueprintjs/core": "^4.0.3",
         "classnames": "^2.2",
         "react-day-picker": "7.4.9",
-        "react-lifecycles-compat": "^3.0.4",
-        "tslib": "~1.13.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-        }
+        "tslib": "~2.3.1"
       }
     },
     "@blueprintjs/icons": {
-      "version": "3.31.0",
-      "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.31.0.tgz",
-      "integrity": "sha512-6pXhHC8zEvoDKN5KNsIHNuCRKsemmRbXNv1jweB95VaFzR1M+Mik+Qi+13Wd+VtZrzes2ZcWttIeyuK91NoLCw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.1.1.tgz",
+      "integrity": "sha512-UwxNpkMsyIM5hUoili9YJyk4f9/YPB6ErwokJF4aBhcmuPxEXDtvizJhSVOL5omc0GjhedZ9HXEoPZhbYLGwLw==",
       "requires": {
+        "change-case": "^4.1.2",
         "classnames": "^2.2",
-        "tslib": "~1.13.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-        }
+        "tslib": "~2.3.1"
       }
     },
     "@blueprintjs/popover2": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-0.10.1.tgz",
-      "integrity": "sha512-5zo4TsoGO79yA/CCsENE7cVuSk3BEMzS99iWDdesyh9I9AU0rkSYcaKbAmpIrWfO9Oe4s8lRPms0OrXF2fs94Q==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.0.3.tgz",
+      "integrity": "sha512-PoQwNWa2fCbgzNvvW36DWfX+HK1/0vJWvX9qluZJ06n3/CgA5x+INpbmaXiTQVofEVhHP8H1VcpfDfVMG0LFWw==",
       "requires": {
-        "@blueprintjs/core": "^3.45.0",
+        "@blueprintjs/core": "^4.0.3",
+        "@juggle/resize-observer": "^3.3.1",
         "@popperjs/core": "^2.5.4",
         "classnames": "^2.2",
         "dom4": "^2.1.5",
         "react-popper": "^2.2.4",
-        "resize-observer-polyfill": "^1.5.1",
-        "tslib": "~1.13.0"
+        "tslib": "~2.3.1"
       },
       "dependencies": {
         "react-popper": {
@@ -3292,11 +3276,6 @@
             "react-fast-compare": "^3.0.1",
             "warning": "^4.0.2"
           }
-        },
-        "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
         }
       }
     },
@@ -4598,6 +4577,11 @@
         "@types/yargs": "^13.0.0"
       }
     },
+    "@juggle/resize-observer": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz",
+      "integrity": "sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
@@ -4631,9 +4615,9 @@
       "dev": true
     },
     "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz",
+      "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="
     },
     "@sheerun/mutationobserver-shim": {
       "version": "0.3.2",
@@ -4930,9 +4914,9 @@
       "dev": true
     },
     "@types/dom4": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.1.tgz",
-      "integrity": "sha512-kSkVAvWmMZiCYtvqjqQEwOmvKwcH+V4uiv3qPQ8pAh1Xl39xggGEo8gHUqV4waYGHezdFw0rKBR8Jt0CrQSDZA=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz",
+      "integrity": "sha512-Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g=="
     },
     "@types/enzyme": {
       "version": "3.10.3",
@@ -7081,6 +7065,15 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
+    "camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "requires": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -7111,6 +7104,16 @@
       "integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==",
       "dev": true
     },
+    "capital-case": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz",
+      "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==",
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3",
+        "upper-case-first": "^2.0.2"
+      }
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -7127,6 +7130,25 @@
         "supports-color": "^5.3.0"
       }
     },
+    "change-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz",
+      "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==",
+      "requires": {
+        "camel-case": "^4.1.2",
+        "capital-case": "^1.0.4",
+        "constant-case": "^3.0.4",
+        "dot-case": "^3.0.4",
+        "header-case": "^2.0.4",
+        "no-case": "^3.0.4",
+        "param-case": "^3.0.4",
+        "pascal-case": "^3.1.2",
+        "path-case": "^3.0.4",
+        "sentence-case": "^3.0.4",
+        "snake-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "char-regex": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
@@ -7615,6 +7637,16 @@
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
+    "constant-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz",
+      "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==",
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3",
+        "upper-case": "^2.0.2"
+      }
+    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -8032,8 +8064,7 @@
     "csstype": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz",
-      "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g==",
-      "dev": true
+      "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g=="
     },
     "currently-unhandled": {
       "version": "0.4.1",
@@ -8382,11 +8413,22 @@
       }
     },
     "dom-helpers": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
       "requires": {
-        "@babel/runtime": "^7.1.2"
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.17.8",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
+          "integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
       }
     },
     "dom-serializer": {
@@ -8446,6 +8488,15 @@
         "domelementtype": "1"
       }
     },
+    "dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "druid-query-toolkit": {
       "version": "0.14.6",
       "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-0.14.6.tgz",
@@ -10996,6 +11047,15 @@
         }
       }
     },
+    "header-case": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz",
+      "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==",
+      "requires": {
+        "capital-case": "^1.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "history": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
@@ -15524,6 +15584,14 @@
         "signal-exit": "^3.0.0"
       }
     },
+    "lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "requires": {
+        "tslib": "^2.0.3"
+      }
+    },
     "make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -16083,6 +16151,15 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "requires": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
     "node-fetch": {
       "version": "2.6.7",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
@@ -16819,6 +16896,15 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
+    "param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "requires": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -16875,12 +16961,30 @@
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true
     },
+    "pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz",
+      "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==",
+      "requires": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -18981,11 +19085,6 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
       "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
     },
-    "react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-    },
     "react-popper": {
       "version": "1.3.11",
       "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz",
@@ -19057,14 +19156,14 @@
       }
     },
     "react-transition-group": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
-      "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
+      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
       "requires": {
-        "dom-helpers": "^3.4.0",
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
         "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2",
-        "react-lifecycles-compat": "^3.0.4"
+        "prop-types": "^15.6.2"
       }
     },
     "read-installed": {
@@ -19500,11 +19599,6 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
-    "resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
     "resolve": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
@@ -19790,6 +19884,16 @@
         }
       }
     },
+    "sentence-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz",
+      "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==",
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3",
+        "upper-case-first": "^2.0.2"
+      }
+    },
     "serialize-javascript": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
@@ -20023,6 +20127,15 @@
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true
     },
+    "snake-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
+      "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==",
+      "requires": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -22434,6 +22547,22 @@
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
+    "upper-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz",
+      "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==",
+      "requires": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "upper-case-first": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz",
+      "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==",
+      "requires": {
+        "tslib": "^2.0.3"
+      }
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
diff --git a/web-console/package.json b/web-console/package.json
index 6ecb3fb37c..457f3d7863 100644
--- a/web-console/package.json
+++ b/web-console/package.json
@@ -66,10 +66,10 @@
     "not ie 11"
   ],
   "dependencies": {
-    "@blueprintjs/core": "^3.45.0",
-    "@blueprintjs/datetime": "^3.23.4",
-    "@blueprintjs/icons": "^3.31.0",
-    "@blueprintjs/popover2": "^0.10.1",
+    "@blueprintjs/core": "^4.0.3",
+    "@blueprintjs/datetime": "^4.0.3",
+    "@blueprintjs/icons": "^4.1.1",
+    "@blueprintjs/popover2": "^1.0.3",
     "ace-builds": "^1.4.13",
     "axios": "^0.21.4",
     "classnames": "^2.2.6",
diff --git a/web-console/script/licenses b/web-console/script/licenses
index fdbf2190a9..46df1fdb48 100755
--- a/web-console/script/licenses
+++ b/web-console/script/licenses
@@ -163,6 +163,7 @@ checker.init(
               hasLicense = true;
             } catch (e) {
               console.log(`Could not find license for '${p}': ${JSON.stringify(meta)}`);
+              console.log(`Find and copy the package's license file to '../${licenseDest}'`);
             }
           }
         }
diff --git a/web-console/src/blueprint-overrides/common/_variables.scss b/web-console/src/blueprint-overrides/common/_variables.scss
index 1527fbe4ab..b8798c76b8 100644
--- a/web-console/src/blueprint-overrides/common/_variables.scss
+++ b/web-console/src/blueprint-overrides/common/_variables.scss
@@ -18,7 +18,7 @@
 
 // Namespace appended to the beginning of each CSS class: `.#{$ns}-button`.
 // Do not quote this value, for Less consumers.
-$ns: bp3;
+$ns: bp4;
 
 // easily the most important variable, so it comes up top
 // (so other variables can use it to define themselves)
diff --git a/web-console/src/bootstrap/ace.scss b/web-console/src/bootstrap/ace.scss
index f06fe0c361..ebe74d4c41 100644
--- a/web-console/src/bootstrap/ace.scss
+++ b/web-console/src/bootstrap/ace.scss
@@ -41,7 +41,7 @@
     background: $gray5;
     color: $gray1;
 
-    .bp3-dark & {
+    .#{$bp-ns}-dark & {
       background: $dark-gray4;
       color: $gray5;
     }
@@ -79,7 +79,7 @@
   border-radius: 2px;
   box-shadow: 0 5px 15px rgba(15, 19, 32, 0.45);
 
-  .bp3-dark & {
+  .#{$bp-ns}-dark & {
     background: $dark-gray4;
   }
 
diff --git a/web-console/src/bootstrap/react-table-custom-pagination.scss b/web-console/src/bootstrap/react-table-custom-pagination.scss
index 1acacfe663..4bfacb31e8 100644
--- a/web-console/src/bootstrap/react-table-custom-pagination.scss
+++ b/web-console/src/bootstrap/react-table-custom-pagination.scss
@@ -16,30 +16,29 @@
  * limitations under the License.
  */
 
-@import '../blueprint-overrides/common/colors';
-@import '../blueprint-overrides/common/variables';
+@import '../variables';
 
 .ReactTable {
   .-pageJump {
-    .bp3-input {
+    .#{$bp-ns}-input {
       position: relative;
       top: -2px;
       border: none;
 
-      .bp3-dark & {
+      .#{$bp-ns}-dark & {
         background-color: $dark-gray4;
       }
     }
   }
 
   .-pageSizeOptions {
-    .bp3-html-select select {
+    .#{$bp-ns}-html-select select {
       width: 90px;
       position: relative;
       top: -2px;
       border: none;
 
-      .bp3-dark & {
+      .#{$bp-ns}-dark & {
         background-color: $dark-gray4;
       }
     }
diff --git a/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap b/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap
index f348b8d0c2..dbc0119e3f 100644
--- a/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap
+++ b/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap
@@ -5,7 +5,8 @@ exports[`ActionCell matches snapshot 1`] = `
   class="action-cell"
 >
   <span
-    class="bp3-icon bp3-icon-search-template action-icon"
+    aria-hidden="true"
+    class="bp4-icon bp4-icon-search-template action-icon"
     icon="search-template"
   >
     <svg
@@ -14,9 +15,6 @@ exports[`ActionCell matches snapshot 1`] = `
       viewBox="0 0 16 16"
       width="16"
     >
-      <desc>
-        search-template
-      </desc>
       <path
         d="M15.55 13.43l-2.67-2.67c.7-1.09 1.11-2.38 1.11-3.77 0-3.87-3.13-7-7-7s-7 3.13-7 7 3.13 7 7 7c1.39 0 2.68-.41 3.77-1.11l2.67 2.67a1.498 1.498 0 102.12-2.12zm-8.56-1.44c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm2.5-6h-5c-.28 0-.5.22-.5.5s.22.5.5.5h5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm0-2h-5c-.28 0-.5.22-.5.5s.22.5.5.5h5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm0 4h-5c-.28 0-.5.22-.5.5s.22.5.5.5h5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5z"
         fill-rule="evenodd"
diff --git a/web-console/src/components/action-icon/__snapshots__/action-icon.spec.tsx.snap b/web-console/src/components/action-icon/__snapshots__/action-icon.spec.tsx.snap
index eae9529c3d..a1358b3d4f 100644
--- a/web-console/src/components/action-icon/__snapshots__/action-icon.spec.tsx.snap
+++ b/web-console/src/components/action-icon/__snapshots__/action-icon.spec.tsx.snap
@@ -2,7 +2,8 @@
 
 exports[`ActionIcon matches snapshot 1`] = `
 <span
-  class="bp3-icon bp3-icon-clipboard action-icon"
+  aria-hidden="true"
+  class="bp4-icon bp4-icon-clipboard action-icon"
   icon="clipboard"
 >
   <svg
@@ -11,9 +12,6 @@ exports[`ActionIcon matches snapshot 1`] = `
     viewBox="0 0 16 16"
     width="16"
   >
-    <desc>
-      clipboard
-    </desc>
     <path
       d="M11 2c0-.55-.45-1-1-1h.22C9.88.4 9.24 0 8.5 0S7.12.4 6.78 1H7c-.55 0-1 .45-1 1v1h5V2zm2 0h-1v2H5V2H4c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h9c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"
       fill-rule="evenodd"
diff --git a/web-console/src/components/array-input/__snapshots__/array-input.spec.tsx.snap b/web-console/src/components/array-input/__snapshots__/array-input.spec.tsx.snap
index 52fcbe5444..5413bfd5c0 100644
--- a/web-console/src/components/array-input/__snapshots__/array-input.spec.tsx.snap
+++ b/web-console/src/components/array-input/__snapshots__/array-input.spec.tsx.snap
@@ -5,21 +5,24 @@ exports[`ArrayInput matches snapshot 1`] = `
   class="array-input test"
 >
   <textarea
-    class="bp3-input bp3-fill test"
+    class="bp4-input bp4-fill test"
     placeholder="test"
   >
     apple, banana, pear
   </textarea>
   <span
-    class="suggestion-button bp3-popover2-target"
+    aria-haspopup="true"
+    class="suggestion-button bp4-popover2-target"
   >
     <button
-      class="bp3-button bp3-minimal"
+      class="bp4-button bp4-minimal"
       type="button"
     >
       <span
-        class="bp3-icon bp3-icon-plus"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-plus"
         icon="plus"
+        tabindex="0"
       >
         <svg
           data-icon="plus"
@@ -27,9 +30,6 @@ exports[`ArrayInput matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            plus
-          </desc>
           <path
             d="M13 7H9V3c0-.55-.45-1-1-1s-1 .45-1 1v4H3c-.55 0-1 .45-1 1s.45 1 1 1h4v4c0 .55.45 1 1 1s1-.45 1-1V9h4c.55 0 1-.45 1-1s-.45-1-1-1z"
             fill-rule="evenodd"
diff --git a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
index 1a739957c5..5d2cf24413 100644
--- a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
+++ b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
@@ -21,7 +21,7 @@ exports[`AutoForm matches snapshot 1`] = `
     key="testSizeBytes"
     label="Test size bytes"
   >
-    <Blueprint3.NumericInput
+    <Blueprint4.NumericInput
       allowNumericCharactersOnly={true}
       buttonPosition="right"
       clampValueOnBlur={false}
@@ -82,43 +82,43 @@ exports[`AutoForm matches snapshot 1`] = `
     key="testBoolean"
     label="Test boolean"
   >
-    <Blueprint3.ButtonGroup>
-      <Blueprint3.Button
+    <Blueprint4.ButtonGroup>
+      <Blueprint4.Button
         active={false}
         disabled={false}
         onClick={[Function]}
       >
         False
-      </Blueprint3.Button>
-      <Blueprint3.Button
+      </Blueprint4.Button>
+      <Blueprint4.Button
         active={false}
         disabled={false}
         onClick={[Function]}
       >
         True
-      </Blueprint3.Button>
-    </Blueprint3.ButtonGroup>
+      </Blueprint4.Button>
+    </Blueprint4.ButtonGroup>
   </Memo(FormGroupWithInfo)>
   <Memo(FormGroupWithInfo)
     key="testBooleanWithDefault"
     label="Test boolean with default"
   >
-    <Blueprint3.ButtonGroup>
-      <Blueprint3.Button
+    <Blueprint4.ButtonGroup>
+      <Blueprint4.Button
         active={true}
         disabled={false}
         onClick={[Function]}
       >
         False
-      </Blueprint3.Button>
-      <Blueprint3.Button
+      </Blueprint4.Button>
+      <Blueprint4.Button
         active={false}
         disabled={false}
         onClick={[Function]}
       >
         True
-      </Blueprint3.Button>
-    </Blueprint3.ButtonGroup>
+      </Blueprint4.Button>
+    </Blueprint4.ButtonGroup>
   </Memo(FormGroupWithInfo)>
   <Memo(FormGroupWithInfo)
     key="testStringArray"
@@ -170,16 +170,16 @@ exports[`AutoForm matches snapshot 1`] = `
       value=""
     />
   </Memo(FormGroupWithInfo)>
-  <Blueprint3.FormGroup
+  <Blueprint4.FormGroup
     key="more-or-less"
   >
-    <Blueprint3.Button
+    <Blueprint4.Button
       fill={true}
       minimal={true}
       onClick={[Function]}
       rightIcon="chevron-down"
       text="Show more"
     />
-  </Blueprint3.FormGroup>
+  </Blueprint4.FormGroup>
 </div>
 `;
diff --git a/web-console/src/components/auto-form/auto-form.scss b/web-console/src/components/auto-form/auto-form.scss
index 94ce1f32fe..5523f0f817 100644
--- a/web-console/src/components/auto-form/auto-form.scss
+++ b/web-console/src/components/auto-form/auto-form.scss
@@ -16,12 +16,14 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .auto-form {
   // Popover in info label
-  label.bp3-label {
+  label.#{$bp-ns}-label {
     position: relative;
 
-    .bp3-text-muted {
+    .#{$bp-ns}-text-muted {
       position: absolute;
       right: 0;
     }
diff --git a/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap b/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap
index 57554f5bc7..a5ac890d6a 100644
--- a/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap
+++ b/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap
@@ -2,25 +2,27 @@
 
 exports[`ClearableInput matches snapshot 1`] = `
 <div
-  class="bp3-input-group clearable-input testClassName"
+  class="bp4-input-group clearable-input testClassName"
 >
   <input
-    class="bp3-input"
+    class="bp4-input"
     placeholder="testPlaceholder"
     style="padding-right: 0px;"
     type="text"
     value="testValue"
   />
   <span
-    class="bp3-input-action"
+    class="bp4-input-action"
   >
     <button
-      class="bp3-button bp3-minimal"
+      class="bp4-button bp4-minimal"
       type="button"
     >
       <span
-        class="bp3-icon bp3-icon-cross"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-cross"
         icon="cross"
+        tabindex="0"
       >
         <svg
           data-icon="cross"
@@ -28,9 +30,6 @@ exports[`ClearableInput matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            cross
-          </desc>
           <path
             d="M9.41 8l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L8 6.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L6.59 8 3.3 11.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71L8 9.41l3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L9.41 8z"
             fill-rule="evenodd"
diff --git a/web-console/src/components/date-range-selector/date-range-selector.scss b/web-console/src/components/date-range-selector/date-range-selector.scss
index a30d622876..39df4d75f2 100644
--- a/web-console/src/components/date-range-selector/date-range-selector.scss
+++ b/web-console/src/components/date-range-selector/date-range-selector.scss
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .date-range-selector {
-  .bp3-popover-target {
+  .#{$bp-ns}-popover-target {
     display: block;
   }
 
diff --git a/web-console/src/components/form-group-with-info/__snapshots__/form-group-with-info.spec.tsx.snap b/web-console/src/components/form-group-with-info/__snapshots__/form-group-with-info.spec.tsx.snap
index c2a7d1dcbc..68651efe52 100644
--- a/web-console/src/components/form-group-with-info/__snapshots__/form-group-with-info.spec.tsx.snap
+++ b/web-console/src/components/form-group-with-info/__snapshots__/form-group-with-info.spec.tsx.snap
@@ -2,21 +2,23 @@
 
 exports[`FormGroupWithInfo matches snapshot 1`] = `
 <div
-  class="bp3-form-group form-group-with-info"
+  class="bp4-form-group form-group-with-info"
 >
   <label
-    class="bp3-label"
+    class="bp4-label"
   >
     Goodies
      
     <span
-      class="bp3-text-muted"
+      class="bp4-text-muted"
     >
       <span
-        class="info-popover bp3-popover2-target"
+        aria-haspopup="true"
+        class="info-popover bp4-popover2-target"
       >
         <span
-          class="bp3-icon bp3-icon-info-sign"
+          aria-hidden="true"
+          class="bp4-icon bp4-icon-info-sign"
           icon="info-sign"
         >
           <svg
@@ -25,9 +27,6 @@ exports[`FormGroupWithInfo matches snapshot 1`] = `
             viewBox="0 0 16 16"
             width="14"
           >
-            <desc>
-              info-sign
-            </desc>
             <path
               d="M8 0C3.58 0 0 3.58 0 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zM7 3h2v2H7V3zm3 10H6v-1h1V7H6V6h3v6h1v1z"
               fill-rule="evenodd"
@@ -38,7 +37,7 @@ exports[`FormGroupWithInfo matches snapshot 1`] = `
     </span>
   </label>
   <div
-    class="bp3-form-content"
+    class="bp4-form-content"
   >
     Some buttons and stuff
   </div>
diff --git a/web-console/src/components/form-group-with-info/form-group-with-info.scss b/web-console/src/components/form-group-with-info/form-group-with-info.scss
index 40ac3cc1c3..c9587cb088 100644
--- a/web-console/src/components/form-group-with-info/form-group-with-info.scss
+++ b/web-console/src/components/form-group-with-info/form-group-with-info.scss
@@ -16,12 +16,14 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .form-group-with-info {
-  .bp3-text-muted .bp3-popover2-target {
+  .#{$bp-ns}-text-muted .#{$bp-ns}-popover2-target {
     margin-top: 0;
   }
 
-  .bp3-form-content {
+  .#{$bp-ns}-form-content {
     position: relative;
 
     & > .info-popover {
diff --git a/web-console/src/components/form-json-selector/__snapshots__/form-json-selector.spec.tsx.snap b/web-console/src/components/form-json-selector/__snapshots__/form-json-selector.spec.tsx.snap
index d2ec216202..7c5a605859 100644
--- a/web-console/src/components/form-json-selector/__snapshots__/form-json-selector.spec.tsx.snap
+++ b/web-console/src/components/form-json-selector/__snapshots__/form-json-selector.spec.tsx.snap
@@ -1,43 +1,43 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FormJsonSelector matches snapshot form json 1`] = `
-<Blueprint3.FormGroup
+<Blueprint4.FormGroup
   className="form-json-selector"
 >
-  <Blueprint3.ButtonGroup
+  <Blueprint4.ButtonGroup
     fill={true}
   >
-    <Blueprint3.Button
+    <Blueprint4.Button
       active={false}
       onClick={[Function]}
       text="Form"
     />
-    <Blueprint3.Button
+    <Blueprint4.Button
       active={true}
       onClick={[Function]}
       text="JSON"
     />
-  </Blueprint3.ButtonGroup>
-</Blueprint3.FormGroup>
+  </Blueprint4.ButtonGroup>
+</Blueprint4.FormGroup>
 `;
 
 exports[`FormJsonSelector matches snapshot form tab 1`] = `
-<Blueprint3.FormGroup
+<Blueprint4.FormGroup
   className="form-json-selector"
 >
-  <Blueprint3.ButtonGroup
+  <Blueprint4.ButtonGroup
     fill={true}
   >
-    <Blueprint3.Button
+    <Blueprint4.Button
       active={true}
       onClick={[Function]}
       text="Form"
     />
-    <Blueprint3.Button
+    <Blueprint4.Button
       active={false}
       onClick={[Function]}
       text="JSON"
     />
-  </Blueprint3.ButtonGroup>
-</Blueprint3.FormGroup>
+  </Blueprint4.ButtonGroup>
+</Blueprint4.FormGroup>
 `;
diff --git a/web-console/src/components/formatted-input/__snapshots__/formatted-input.spec.tsx.snap b/web-console/src/components/formatted-input/__snapshots__/formatted-input.spec.tsx.snap
index 20f74a6555..185682c113 100644
--- a/web-console/src/components/formatted-input/__snapshots__/formatted-input.spec.tsx.snap
+++ b/web-console/src/components/formatted-input/__snapshots__/formatted-input.spec.tsx.snap
@@ -5,10 +5,10 @@ exports[`FormattedInput matches snapshot on undefined value 1`] = `
   class="formatted-input"
 >
   <div
-    class="bp3-input-group"
+    class="bp4-input-group"
   >
     <input
-      class="bp3-input"
+      class="bp4-input"
       type="text"
       value=""
     />
@@ -21,10 +21,10 @@ exports[`FormattedInput matches snapshot with escaped value 1`] = `
   class="formatted-input"
 >
   <div
-    class="bp3-input-group"
+    class="bp4-input-group"
   >
     <input
-      class="bp3-input"
+      class="bp4-input"
       type="text"
       value="Here are some chars \\\\t\\\\r\\\\n lol"
     />
@@ -37,7 +37,7 @@ exports[`FormattedInput matches works with multiline 1`] = `
   class="formatted-input"
 >
   <textarea
-    class="bp3-input"
+    class="bp4-input"
   >
     Here are some chars \\t\\r\\n lol
   </textarea>
diff --git a/web-console/src/components/formatted-input/formatted-input.scss b/web-console/src/components/formatted-input/formatted-input.scss
index 553ce0da3c..46098e694e 100644
--- a/web-console/src/components/formatted-input/formatted-input.scss
+++ b/web-console/src/components/formatted-input/formatted-input.scss
@@ -16,10 +16,12 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .formatted-input {
   position: relative;
 
-  & > .bp3-popover2-target {
+  & > .#{$bp-ns}-popover2-target {
     position: absolute;
     width: 0;
     right: 0;
diff --git a/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap b/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap
index 9547100494..f927f27c0b 100644
--- a/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap
+++ b/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap
@@ -1,10 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`HeaderBar matches snapshot 1`] = `
-<Blueprint3.Navbar
+<Blueprint4.Navbar
   className="header-bar"
 >
-  <Blueprint3.NavbarGroup
+  <Blueprint4.NavbarGroup
     align="left"
   >
     <a
@@ -12,8 +12,8 @@ exports[`HeaderBar matches snapshot 1`] = `
     >
       <Memo(DruidLogo) />
     </a>
-    <Blueprint3.NavbarDivider />
-    <Blueprint3.AnchorButton
+    <Blueprint4.NavbarDivider />
+    <Blueprint4.AnchorButton
       active={true}
       disabled={false}
       href="#load-data"
@@ -22,8 +22,8 @@ exports[`HeaderBar matches snapshot 1`] = `
       minimal={true}
       text="Load data"
     />
-    <Blueprint3.NavbarDivider />
-    <Blueprint3.AnchorButton
+    <Blueprint4.NavbarDivider />
+    <Blueprint4.AnchorButton
       active={false}
       disabled={false}
       href="#ingestion"
@@ -31,7 +31,7 @@ exports[`HeaderBar matches snapshot 1`] = `
       minimal={true}
       text="Ingestion"
     />
-    <Blueprint3.AnchorButton
+    <Blueprint4.AnchorButton
       active={false}
       disabled={false}
       href="#datasources"
@@ -39,7 +39,7 @@ exports[`HeaderBar matches snapshot 1`] = `
       minimal={true}
       text="Datasources"
     />
-    <Blueprint3.AnchorButton
+    <Blueprint4.AnchorButton
       active={false}
       disabled={false}
       href="#segments"
@@ -47,7 +47,7 @@ exports[`HeaderBar matches snapshot 1`] = `
       minimal={true}
       text="Segments"
     />
-    <Blueprint3.AnchorButton
+    <Blueprint4.AnchorButton
       active={false}
       disabled={false}
       href="#services"
@@ -55,8 +55,8 @@ exports[`HeaderBar matches snapshot 1`] = `
       minimal={true}
       text="Services"
     />
-    <Blueprint3.NavbarDivider />
-    <Blueprint3.AnchorButton
+    <Blueprint4.NavbarDivider />
+    <Blueprint4.AnchorButton
       active={false}
       disabled={false}
       href="#query"
@@ -64,8 +64,8 @@ exports[`HeaderBar matches snapshot 1`] = `
       minimal={true}
       text="Query"
     />
-  </Blueprint3.NavbarGroup>
-  <Blueprint3.NavbarGroup
+  </Blueprint4.NavbarGroup>
+  <Blueprint4.NavbarGroup
     align="right"
   >
     <Memo(RestrictedMode)
@@ -77,85 +77,100 @@ exports[`HeaderBar matches snapshot 1`] = `
         }
       }
     />
-    <Blueprint3.Popover2
+    <Blueprint4.Popover2
       boundary="clippingParents"
       captureDismiss={false}
       content={
-        <Blueprint3.Menu>
-          <Blueprint3.MenuItem
+        <Blueprint4.Menu>
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="pulse"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Druid Doctor"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="settings"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Coordinator dynamic config"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="wrench"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Overlord dynamic config"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
             active={false}
             disabled={false}
             href="#lookups"
             icon="properties"
             multiline={false}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Lookups"
           />
-          <Blueprint3.MenuDivider />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuDivider />
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="cog"
             multiline={false}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Console options"
           >
             <React.Fragment>
-              <Blueprint3.MenuItem
+              <Blueprint4.MenuItem
+                active={false}
                 disabled={false}
                 multiline={false}
                 onClick={[Function]}
                 popoverProps={Object {}}
+                selected={false}
                 shouldDismissPopover={true}
                 text="Force Coordinator/Overlord mode"
               />
-              <Blueprint3.MenuItem
+              <Blueprint4.MenuItem
+                active={false}
                 disabled={false}
                 multiline={false}
                 onClick={[Function]}
                 popoverProps={Object {}}
+                selected={false}
                 shouldDismissPopover={true}
                 text="Force Coordinator mode"
               />
-              <Blueprint3.MenuItem
+              <Blueprint4.MenuItem
+                active={false}
                 disabled={false}
                 multiline={false}
                 onClick={[Function]}
                 popoverProps={Object {}}
+                selected={false}
                 shouldDismissPopover={true}
                 text="Force Overlord mode"
               />
             </React.Fragment>
-          </Blueprint3.MenuItem>
-        </Blueprint3.Menu>
+          </Blueprint4.MenuItem>
+        </Blueprint4.Menu>
       }
       defaultIsOpen={false}
       disabled={false}
@@ -169,70 +184,81 @@ exports[`HeaderBar matches snapshot 1`] = `
       openOnTargetFocus={true}
       position="bottom-right"
       positioningStrategy="absolute"
+      shouldReturnFocusOnClose={false}
       targetTagName="span"
       transitionDuration={300}
       usePortal={true}
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         icon="cog"
         minimal={true}
       />
-    </Blueprint3.Popover2>
-    <Blueprint3.Popover2
+    </Blueprint4.Popover2>
+    <Blueprint4.Popover2
       boundary="clippingParents"
       captureDismiss={false}
       content={
-        <Blueprint3.Menu>
-          <Blueprint3.MenuItem
+        <Blueprint4.Menu>
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="graph"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="About"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             href="https://druid.apache.org/docs/0.20.0"
             icon="th"
             multiline={false}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             target="_blank"
             text="Docs"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             href="https://groups.google.com/forum/#!forum/druid-user"
             icon="user"
             multiline={false}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             target="_blank"
             text="User group"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             href="https://druid.apache.org/community/join-slack"
             icon="chat"
             multiline={false}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             target="_blank"
             text="Slack channel"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             href="https://github.com/apache/druid"
             icon="git-branch"
             multiline={false}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             target="_blank"
             text="GitHub"
           />
-        </Blueprint3.Menu>
+        </Blueprint4.Menu>
       }
       defaultIsOpen={false}
       disabled={false}
@@ -246,15 +272,16 @@ exports[`HeaderBar matches snapshot 1`] = `
       openOnTargetFocus={true}
       position="bottom-right"
       positioningStrategy="absolute"
+      shouldReturnFocusOnClose={false}
       targetTagName="span"
       transitionDuration={300}
       usePortal={true}
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         icon="help"
         minimal={true}
       />
-    </Blueprint3.Popover2>
-  </Blueprint3.NavbarGroup>
-</Blueprint3.Navbar>
+    </Blueprint4.Popover2>
+  </Blueprint4.NavbarGroup>
+</Blueprint4.Navbar>
 `;
diff --git a/web-console/src/components/header-bar/header-bar.scss b/web-console/src/components/header-bar/header-bar.scss
index 30365db3be..783b472cb8 100644
--- a/web-console/src/components/header-bar/header-bar.scss
+++ b/web-console/src/components/header-bar/header-bar.scss
@@ -43,7 +43,7 @@
         fill: $druid-brand2;
       }
 
-      .bp3-dark & {
+      .#{$bp-ns}-dark & {
         .letter {
           fill: $white;
         }
@@ -59,29 +59,29 @@
     white-space: nowrap;
   }
 
-  .bp3-navbar-divider {
+  .#{$bp-ns}-navbar-divider {
     margin: 0 11px;
   }
 
-  .bp3-button.bp3-minimal {
+  .#{$bp-ns}-button.#{$bp-ns}-minimal {
     border-radius: 20px;
     margin: 0 1px;
 
-    .bp3-icon {
+    .#{$bp-ns}-icon {
       svg {
         fill: $blue3;
 
-        .bp3-dark & {
+        .#{$bp-ns}-dark & {
           fill: $druid-brand;
         }
       }
     }
-    .bp3-dark & {
+    .#{$bp-ns}-dark & {
       &:hover {
         background: rgba($dark-gray5, 0.5);
       }
 
-      &.bp3-active {
+      &.#{$bp-ns}-active {
         background: rgba($dark-gray5, 0.9);
       }
     }
diff --git a/web-console/src/components/interval-input/__snapshots__/interval-input.spec.tsx.snap b/web-console/src/components/interval-input/__snapshots__/interval-input.spec.tsx.snap
index 2c1b95a5cc..3701ec7b6a 100644
--- a/web-console/src/components/interval-input/__snapshots__/interval-input.spec.tsx.snap
+++ b/web-console/src/components/interval-input/__snapshots__/interval-input.spec.tsx.snap
@@ -2,28 +2,30 @@
 
 exports[`IntervalInput matches snapshot 1`] = `
 <div
-  class="bp3-input-group bp3-intent-primary"
+  class="bp4-input-group bp4-intent-primary"
 >
   <input
-    class="bp3-input"
+    class="bp4-input"
     placeholder="2010-01-01/2020-01-01"
     style="padding-right: 0px;"
     type="text"
     value="2010-01-01/2020-01-01"
   />
   <span
-    class="bp3-input-action"
+    class="bp4-input-action"
   >
     <div>
       <span
-        class="bp3-popover2-target"
+        aria-haspopup="true"
+        class="bp4-popover2-target"
       >
         <button
-          class="bp3-button"
+          class="bp4-button"
           type="button"
         >
           <span
-            class="bp3-icon bp3-icon-calendar"
+            aria-hidden="true"
+            class="bp4-icon bp4-icon-calendar"
             icon="calendar"
           >
             <svg
@@ -32,9 +34,6 @@ exports[`IntervalInput matches snapshot 1`] = `
               viewBox="0 0 16 16"
               width="16"
             >
-              <desc>
-                calendar
-              </desc>
               <path
                 d="M11 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1s-1 .4-1 1v1c0 .5.4 1 1 1zm3-2h-1v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H6v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H1c-.6 0-1 .5-1 1v12c0 .6.4 1 1 1h13c.6 0 1-.4 1-1V2c0-.6-.5-1-1-1zM5 13H2v-3h3v3zm0-4H2V6h3v3zm4 4H6v-3h3v3zm0-4H6V6h3v3zm4 4h-3v-3h3v3zm0-4h-3V6h3v3zM4 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1S3 .4 3 1v1c0 .5.4 1 1 1z"
                 fill-rule="evenodd"
diff --git a/web-console/src/components/json-collapse/__snapshots__/json-collapse.spec.tsx.snap b/web-console/src/components/json-collapse/__snapshots__/json-collapse.spec.tsx.snap
index 904346cff7..376d420143 100644
--- a/web-console/src/components/json-collapse/__snapshots__/json-collapse.spec.tsx.snap
+++ b/web-console/src/components/json-collapse/__snapshots__/json-collapse.spec.tsx.snap
@@ -7,25 +7,25 @@ exports[`JsonCollapse matches snapshot 1`] = `
   <div
     className="collapse-buttons"
   >
-    <Blueprint3.Button
+    <Blueprint4.Button
       active={false}
       minimal={true}
       onClick={[Function]}
       text="test"
     />
   </div>
-  <Blueprint3.Collapse
+  <Blueprint4.Collapse
     component="div"
     isOpen={false}
     keepChildrenMounted={false}
     transitionDuration={200}
   >
-    <Blueprint3.TextArea
+    <Blueprint4.TextArea
       readOnly={true}
       value="{
   \\"name\\": \\"test\\"
 }"
     />
-  </Blueprint3.Collapse>
+  </Blueprint4.Collapse>
 </div>
 `;
diff --git a/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap b/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap
index 96312ffad7..855f81282e 100644
--- a/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap
+++ b/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap
@@ -5,29 +5,33 @@ exports[`MenuCheckbox matches snapshot checked 1`] = `
   class=""
 >
   <a
-    class="bp3-menu-item menu-checkbox"
+    class="bp4-menu-item menu-checkbox"
+    tabindex="0"
   >
     <span
-      class="bp3-icon bp3-icon-tick-circle"
-      icon="tick-circle"
+      class="bp4-menu-item-icon"
     >
-      <svg
-        data-icon="tick-circle"
-        height="16"
-        viewBox="0 0 16 16"
-        width="16"
+      <span
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-tick-circle"
+        icon="tick-circle"
+        tabindex="-1"
       >
-        <desc>
-          tick-circle
-        </desc>
-        <path
-          d="M8 16c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm4-11c-.28 0-.53.11-.71.29L7 9.59l-2.29-2.3a1.003 1.003 0 00-1.42 1.42l3 3c.18.18.43.29.71.29s.53-.11.71-.29l5-5A1.003 1.003 0 0012 5z"
-          fill-rule="evenodd"
-        />
-      </svg>
+        <svg
+          data-icon="tick-circle"
+          height="16"
+          viewBox="0 0 16 16"
+          width="16"
+        >
+          <path
+            d="M8 16c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm4-11c-.28 0-.53.11-.71.29L7 9.59l-2.29-2.3a1.003 1.003 0 00-1.42 1.42l3 3c.18.18.43.29.71.29s.53-.11.71-.29l5-5A1.003 1.003 0 0012 5z"
+            fill-rule="evenodd"
+          />
+        </svg>
+      </span>
     </span>
     <div
-      class="bp3-text-overflow-ellipsis bp3-fill"
+      class="bp4-fill bp4-text-overflow-ellipsis"
     >
       hello
     </div>
@@ -40,29 +44,33 @@ exports[`MenuCheckbox matches snapshot unchecked 1`] = `
   class=""
 >
   <a
-    class="bp3-menu-item menu-checkbox"
+    class="bp4-menu-item menu-checkbox"
+    tabindex="0"
   >
     <span
-      class="bp3-icon bp3-icon-circle"
-      icon="circle"
+      class="bp4-menu-item-icon"
     >
-      <svg
-        data-icon="circle"
-        height="16"
-        viewBox="0 0 16 16"
-        width="16"
+      <span
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-circle"
+        icon="circle"
+        tabindex="-1"
       >
-        <desc>
-          circle
-        </desc>
-        <path
-          d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 14c-3.3 0-6-2.7-6-6s2.7-6 6-6 6 2.7 6 6-2.7 6-6 6z"
-          fill-rule="evenodd"
-        />
-      </svg>
+        <svg
+          data-icon="circle"
+          height="16"
+          viewBox="0 0 16 16"
+          width="16"
+        >
+          <path
+            d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 14c-3.3 0-6-2.7-6-6s2.7-6 6-6 6 2.7 6 6-2.7 6-6 6z"
+            fill-rule="evenodd"
+          />
+        </svg>
+      </span>
     </span>
     <div
-      class="bp3-text-overflow-ellipsis bp3-fill"
+      class="bp4-fill bp4-text-overflow-ellipsis"
     >
       hello
     </div>
diff --git a/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap b/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap
index 1619365f6d..119b10c70d 100644
--- a/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap
+++ b/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap
@@ -2,17 +2,20 @@
 
 exports[`MoreButton matches snapshot (empty) 1`] = `
 <span
-  class="more-button bp3-popover2-target"
+  aria-haspopup="true"
+  class="more-button bp4-popover2-target"
 >
   <button
-    class="bp3-button bp3-disabled"
+    class="bp4-button bp4-disabled"
     disabled=""
     tabindex="-1"
     type="button"
   >
     <span
-      class="bp3-icon bp3-icon-more"
+      aria-hidden="true"
+      class="bp4-icon bp4-icon-more"
       icon="more"
+      tabindex="0"
     >
       <svg
         data-icon="more"
@@ -20,9 +23,6 @@ exports[`MoreButton matches snapshot (empty) 1`] = `
         viewBox="0 0 16 16"
         width="16"
       >
-        <desc>
-          more
-        </desc>
         <path
           d="M2 6.03a2 2 0 100 4 2 2 0 100-4zM14 6.03a2 2 0 100 4 2 2 0 100-4zM8 6.03a2 2 0 100 4 2 2 0 100-4z"
           fill-rule="evenodd"
@@ -35,15 +35,18 @@ exports[`MoreButton matches snapshot (empty) 1`] = `
 
 exports[`MoreButton matches snapshot (full) 1`] = `
 <span
-  class="more-button bp3-popover2-target"
+  aria-haspopup="true"
+  class="more-button bp4-popover2-target"
 >
   <button
-    class="bp3-button"
+    class="bp4-button"
     type="button"
   >
     <span
-      class="bp3-icon bp3-icon-more"
+      aria-hidden="true"
+      class="bp4-icon bp4-icon-more"
       icon="more"
+      tabindex="0"
     >
       <svg
         data-icon="more"
@@ -51,9 +54,6 @@ exports[`MoreButton matches snapshot (full) 1`] = `
         viewBox="0 0 16 16"
         width="16"
       >
-        <desc>
-          more
-        </desc>
         <path
           d="M2 6.03a2 2 0 100 4 2 2 0 100-4zM14 6.03a2 2 0 100 4 2 2 0 100-4zM8 6.03a2 2 0 100 4 2 2 0 100-4z"
           fill-rule="evenodd"
diff --git a/web-console/src/components/numeric-input-with-default/__snapshots__/numeric-input-with-default.spec.tsx.snap b/web-console/src/components/numeric-input-with-default/__snapshots__/numeric-input-with-default.spec.tsx.snap
index 75335f79dc..911620bfde 100644
--- a/web-console/src/components/numeric-input-with-default/__snapshots__/numeric-input-with-default.spec.tsx.snap
+++ b/web-console/src/components/numeric-input-with-default/__snapshots__/numeric-input-with-default.spec.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`NumericInputWithDefault matches snapshot 1`] = `
-<Blueprint3.NumericInput
+<Blueprint4.NumericInput
   allowNumericCharactersOnly={true}
   buttonPosition="right"
   clampValueOnBlur={false}
diff --git a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
index 2c6c07807b..4c54888d9e 100644
--- a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
+++ b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
@@ -8,16 +8,17 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
     class="title"
   >
     <button
-      class="bp3-button bp3-minimal left"
+      class="bp4-button bp4-minimal left"
       type="button"
     >
       <span
-        class="bp3-button-text"
+        class="bp4-button-text"
       >
         loadForever
       </span>
       <span
-        class="bp3-icon bp3-icon-caret-down"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-caret-down"
         icon="caret-down"
       >
         <svg
@@ -26,9 +27,6 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            caret-down
-          </desc>
           <path
             d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
             fill-rule="evenodd"
@@ -40,12 +38,14 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
       class="spacer"
     />
     <button
-      class="bp3-button bp3-minimal"
+      class="bp4-button bp4-minimal"
       type="button"
     >
       <span
-        class="bp3-icon bp3-icon-trash"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-trash"
         icon="trash"
+        tabindex="0"
       >
         <svg
           data-icon="trash"
@@ -53,9 +53,6 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            trash
-          </desc>
           <path
             d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
             fill-rule="evenodd"
@@ -65,28 +62,28 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
     </button>
   </div>
   <div
-    class="bp3-collapse"
+    class="bp4-collapse"
     style="height: auto; overflow-y: visible; transition: none;"
   >
     <div
       aria-hidden="false"
-      class="bp3-collapse-body"
+      class="bp4-collapse-body"
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp3-card bp3-elevation-2"
+        class="bp4-card bp4-elevation-2"
       >
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <div
-                class="bp3-html-select"
+                class="bp4-html-select"
               >
                 <select>
                   <option
@@ -141,7 +138,7 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -151,7 +148,7 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -164,24 +161,26 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
           </div>
         </div>
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-form-group right"
+              class="bp4-form-group right"
             >
               <div
-                class="bp3-form-content"
+                class="bp4-form-content"
               >
                 <button
-                  class="bp3-button bp3-minimal"
+                  class="bp4-button bp4-minimal"
                   type="button"
                 >
                   <span
-                    class="bp3-icon bp3-icon-plus"
+                    aria-hidden="true"
+                    class="bp4-icon bp4-icon-plus"
                     icon="plus"
+                    tabindex="-1"
                   >
                     <svg
                       data-icon="plus"
@@ -189,9 +188,6 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                     >
-                      <desc>
-                        plus
-                      </desc>
                       <path
                         d="M13 7H9V3c0-.55-.45-1-1-1s-1 .45-1 1v4H3c-.55 0-1 .45-1 1s.45 1 1 1h4v4c0 .55.45 1 1 1s1-.45 1-1V9h4c.55 0 1-.45 1-1s-.45-1-1-1z"
                         fill-rule="evenodd"
@@ -199,7 +195,7 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
                     </svg>
                   </span>
                   <span
-                    class="bp3-button-text"
+                    class="bp4-button-text"
                   >
                     Add a tier
                   </span>
@@ -222,16 +218,17 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
     class="title"
   >
     <button
-      class="bp3-button bp3-minimal left"
+      class="bp4-button bp4-minimal left"
       type="button"
     >
       <span
-        class="bp3-button-text"
+        class="bp4-button-text"
       >
         broadcastByInterval(2010-01-01/2015-01-01)
       </span>
       <span
-        class="bp3-icon bp3-icon-caret-down"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-caret-down"
         icon="caret-down"
       >
         <svg
@@ -240,9 +237,6 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            caret-down
-          </desc>
           <path
             d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
             fill-rule="evenodd"
@@ -254,12 +248,14 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
       class="spacer"
     />
     <button
-      class="bp3-button bp3-minimal"
+      class="bp4-button bp4-minimal"
       type="button"
     >
       <span
-        class="bp3-icon bp3-icon-trash"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-trash"
         icon="trash"
+        tabindex="0"
       >
         <svg
           data-icon="trash"
@@ -267,9 +263,6 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            trash
-          </desc>
           <path
             d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
             fill-rule="evenodd"
@@ -279,28 +272,28 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
     </button>
   </div>
   <div
-    class="bp3-collapse"
+    class="bp4-collapse"
     style="height: auto; overflow-y: visible; transition: none;"
   >
     <div
       aria-hidden="false"
-      class="bp3-collapse-body"
+      class="bp4-collapse-body"
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp3-card bp3-elevation-2"
+        class="bp4-card bp4-elevation-2"
       >
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <div
-                class="bp3-html-select"
+                class="bp4-html-select"
               >
                 <select>
                   <option
@@ -355,7 +348,7 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -365,7 +358,7 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -375,10 +368,10 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
                 </span>
               </div>
               <div
-                class="bp3-input-group"
+                class="bp4-input-group"
               >
                 <input
-                  class="bp3-input"
+                  class="bp4-input"
                   placeholder="2010-01-01/2020-01-01"
                   type="text"
                   value=""
@@ -401,16 +394,17 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
     class="title"
   >
     <button
-      class="bp3-button bp3-minimal left"
+      class="bp4-button bp4-minimal left"
       type="button"
     >
       <span
-        class="bp3-button-text"
+        class="bp4-button-text"
       >
         loadByInterval(2010-01-01/2015-01-01)
       </span>
       <span
-        class="bp3-icon bp3-icon-caret-down"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-caret-down"
         icon="caret-down"
       >
         <svg
@@ -419,9 +413,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            caret-down
-          </desc>
           <path
             d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
             fill-rule="evenodd"
@@ -433,12 +424,14 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
       class="spacer"
     />
     <button
-      class="bp3-button bp3-minimal"
+      class="bp4-button bp4-minimal"
       type="button"
     >
       <span
-        class="bp3-icon bp3-icon-trash"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-trash"
         icon="trash"
+        tabindex="0"
       >
         <svg
           data-icon="trash"
@@ -446,9 +439,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            trash
-          </desc>
           <path
             d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
             fill-rule="evenodd"
@@ -458,28 +448,28 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
     </button>
   </div>
   <div
-    class="bp3-collapse"
+    class="bp4-collapse"
     style="height: auto; overflow-y: visible; transition: none;"
   >
     <div
       aria-hidden="false"
-      class="bp3-collapse-body"
+      class="bp4-collapse-body"
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp3-card bp3-elevation-2"
+        class="bp4-card bp4-elevation-2"
       >
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <div
-                class="bp3-html-select"
+                class="bp4-html-select"
               >
                 <select>
                   <option
@@ -534,7 +524,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -544,7 +534,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -554,10 +544,10 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                 </span>
               </div>
               <div
-                class="bp3-input-group"
+                class="bp4-input-group"
               >
                 <input
-                  class="bp3-input"
+                  class="bp4-input"
                   placeholder="2010-01-01/2020-01-01"
                   type="text"
                   value=""
@@ -567,34 +557,34 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
           </div>
         </div>
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Replicants:
                 </span>
               </button>
               <div
-                class="bp3-control-group bp3-numeric-input"
+                class="bp4-control-group bp4-numeric-input"
               >
                 <div
-                  class="bp3-input-group"
+                  class="bp4-input-group"
                 >
                   <input
                     autocomplete="off"
-                    class="bp3-input"
+                    class="bp4-input"
                     max="256"
                     min="1"
                     type="text"
@@ -602,15 +592,18 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                   />
                 </div>
                 <div
-                  class="bp3-button-group bp3-vertical bp3-fixed"
+                  class="bp4-button-group bp4-vertical bp4-fixed"
                 >
                   <button
-                    class="bp3-button"
+                    aria-label="increment"
+                    class="bp4-button"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-up"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-up"
                       icon="chevron-up"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-up"
@@ -618,9 +611,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-up
-                        </desc>
                         <path
                           d="M12.71 9.29l-4-4C8.53 5.11 8.28 5 8 5s-.53.11-.71.29l-4 4a1.003 1.003 0 001.42 1.42L8 7.41l3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71z"
                           fill-rule="evenodd"
@@ -629,14 +619,17 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     </span>
                   </button>
                   <button
-                    class="bp3-button bp3-disabled"
+                    aria-label="decrement"
+                    class="bp4-button bp4-disabled"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-down"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-down"
                       icon="chevron-down"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-down"
@@ -644,9 +637,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-down
-                        </desc>
                         <path
                           d="M12 5c-.28 0-.53.11-.71.29L8 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42l4 4c.18.18.43.29.71.29s.53-.11.71-.29l4-4A1.003 1.003 0 0012 5z"
                           fill-rule="evenodd"
@@ -657,18 +647,18 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                 </div>
               </div>
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Tier:
                 </span>
               </button>
               <div
-                class="bp3-html-select bp3-fill"
+                class="bp4-html-select bp4-fill"
               >
                 <select>
                   <option
@@ -688,7 +678,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -698,7 +688,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -708,12 +698,14 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                 </span>
               </div>
               <button
-                class="bp3-button"
+                class="bp4-button"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-trash"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-trash"
                   icon="trash"
+                  tabindex="0"
                 >
                   <svg
                     data-icon="trash"
@@ -721,9 +713,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      trash
-                    </desc>
                     <path
                       d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
                       fill-rule="evenodd"
@@ -733,28 +722,28 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
               </button>
             </div>
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Replicants:
                 </span>
               </button>
               <div
-                class="bp3-control-group bp3-numeric-input"
+                class="bp4-control-group bp4-numeric-input"
               >
                 <div
-                  class="bp3-input-group"
+                  class="bp4-input-group"
                 >
                   <input
                     autocomplete="off"
-                    class="bp3-input"
+                    class="bp4-input"
                     max="256"
                     min="1"
                     type="text"
@@ -762,15 +751,18 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                   />
                 </div>
                 <div
-                  class="bp3-button-group bp3-vertical bp3-fixed"
+                  class="bp4-button-group bp4-vertical bp4-fixed"
                 >
                   <button
-                    class="bp3-button"
+                    aria-label="increment"
+                    class="bp4-button"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-up"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-up"
                       icon="chevron-up"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-up"
@@ -778,9 +770,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-up
-                        </desc>
                         <path
                           d="M12.71 9.29l-4-4C8.53 5.11 8.28 5 8 5s-.53.11-.71.29l-4 4a1.003 1.003 0 001.42 1.42L8 7.41l3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71z"
                           fill-rule="evenodd"
@@ -789,12 +778,15 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     </span>
                   </button>
                   <button
-                    class="bp3-button"
+                    aria-label="decrement"
+                    class="bp4-button"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-down"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-down"
                       icon="chevron-down"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-down"
@@ -802,9 +794,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-down
-                        </desc>
                         <path
                           d="M12 5c-.28 0-.53.11-.71.29L8 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42l4 4c.18.18.43.29.71.29s.53-.11.71-.29l4-4A1.003 1.003 0 0012 5z"
                           fill-rule="evenodd"
@@ -815,18 +804,18 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                 </div>
               </div>
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Tier:
                 </span>
               </button>
               <div
-                class="bp3-html-select bp3-fill"
+                class="bp4-html-select bp4-fill"
               >
                 <select>
                   <option
@@ -846,7 +835,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -856,7 +845,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -866,12 +855,14 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                 </span>
               </div>
               <button
-                class="bp3-button"
+                class="bp4-button"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-trash"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-trash"
                   icon="trash"
+                  tabindex="0"
                 >
                   <svg
                     data-icon="trash"
@@ -879,9 +870,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      trash
-                    </desc>
                     <path
                       d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
                       fill-rule="evenodd"
@@ -891,18 +879,20 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
               </button>
             </div>
             <div
-              class="bp3-form-group right"
+              class="bp4-form-group right"
             >
               <div
-                class="bp3-form-content"
+                class="bp4-form-content"
               >
                 <button
-                  class="bp3-button bp3-minimal"
+                  class="bp4-button bp4-minimal"
                   type="button"
                 >
                   <span
-                    class="bp3-icon bp3-icon-plus"
+                    aria-hidden="true"
+                    class="bp4-icon bp4-icon-plus"
                     icon="plus"
+                    tabindex="-1"
                   >
                     <svg
                       data-icon="plus"
@@ -910,9 +900,6 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                       viewBox="0 0 16 16"
                       width="16"
                     >
-                      <desc>
-                        plus
-                      </desc>
                       <path
                         d="M13 7H9V3c0-.55-.45-1-1-1s-1 .45-1 1v4H3c-.55 0-1 .45-1 1s.45 1 1 1h4v4c0 .55.45 1 1 1s1-.45 1-1V9h4c.55 0 1-.45 1-1s-.45-1-1-1z"
                         fill-rule="evenodd"
@@ -920,7 +907,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
                     </svg>
                   </span>
                   <span
-                    class="bp3-button-text"
+                    class="bp4-button-text"
                   >
                     Add a tier
                   </span>
@@ -943,16 +930,17 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
     class="title"
   >
     <button
-      class="bp3-button bp3-minimal left"
+      class="bp4-button bp4-minimal left"
       type="button"
     >
       <span
-        class="bp3-button-text"
+        class="bp4-button-text"
       >
         loadByInterval(2010-01-01/2015-01-01)
       </span>
       <span
-        class="bp3-icon bp3-icon-caret-down"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-caret-down"
         icon="caret-down"
       >
         <svg
@@ -961,9 +949,6 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            caret-down
-          </desc>
           <path
             d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
             fill-rule="evenodd"
@@ -975,12 +960,14 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
       class="spacer"
     />
     <button
-      class="bp3-button bp3-minimal"
+      class="bp4-button bp4-minimal"
       type="button"
     >
       <span
-        class="bp3-icon bp3-icon-trash"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-trash"
         icon="trash"
+        tabindex="0"
       >
         <svg
           data-icon="trash"
@@ -988,9 +975,6 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            trash
-          </desc>
           <path
             d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
             fill-rule="evenodd"
@@ -1000,28 +984,28 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
     </button>
   </div>
   <div
-    class="bp3-collapse"
+    class="bp4-collapse"
     style="height: auto; overflow-y: visible; transition: none;"
   >
     <div
       aria-hidden="false"
-      class="bp3-collapse-body"
+      class="bp4-collapse-body"
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp3-card bp3-elevation-2"
+        class="bp4-card bp4-elevation-2"
       >
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <div
-                class="bp3-html-select"
+                class="bp4-html-select"
               >
                 <select>
                   <option
@@ -1076,7 +1060,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -1086,7 +1070,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -1096,10 +1080,10 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                 </span>
               </div>
               <div
-                class="bp3-input-group"
+                class="bp4-input-group"
               >
                 <input
-                  class="bp3-input"
+                  class="bp4-input"
                   placeholder="2010-01-01/2020-01-01"
                   type="text"
                   value=""
@@ -1109,34 +1093,34 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
           </div>
         </div>
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Replicants:
                 </span>
               </button>
               <div
-                class="bp3-control-group bp3-numeric-input"
+                class="bp4-control-group bp4-numeric-input"
               >
                 <div
-                  class="bp3-input-group"
+                  class="bp4-input-group"
                 >
                   <input
                     autocomplete="off"
-                    class="bp3-input"
+                    class="bp4-input"
                     max="256"
                     min="1"
                     type="text"
@@ -1144,15 +1128,18 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                   />
                 </div>
                 <div
-                  class="bp3-button-group bp3-vertical bp3-fixed"
+                  class="bp4-button-group bp4-vertical bp4-fixed"
                 >
                   <button
-                    class="bp3-button"
+                    aria-label="increment"
+                    class="bp4-button"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-up"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-up"
                       icon="chevron-up"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-up"
@@ -1160,9 +1147,6 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-up
-                        </desc>
                         <path
                           d="M12.71 9.29l-4-4C8.53 5.11 8.28 5 8 5s-.53.11-.71.29l-4 4a1.003 1.003 0 001.42 1.42L8 7.41l3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71z"
                           fill-rule="evenodd"
@@ -1171,12 +1155,15 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                     </span>
                   </button>
                   <button
-                    class="bp3-button"
+                    aria-label="decrement"
+                    class="bp4-button"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-down"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-down"
                       icon="chevron-down"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-down"
@@ -1184,9 +1171,6 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-down
-                        </desc>
                         <path
                           d="M12 5c-.28 0-.53.11-.71.29L8 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42l4 4c.18.18.43.29.71.29s.53-.11.71-.29l4-4A1.003 1.003 0 0012 5z"
                           fill-rule="evenodd"
@@ -1197,18 +1181,18 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                 </div>
               </div>
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Tier:
                 </span>
               </button>
               <div
-                class="bp3-html-select bp3-fill"
+                class="bp4-html-select bp4-fill"
               >
                 <select>
                   <option
@@ -1228,7 +1212,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -1238,7 +1222,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -1248,14 +1232,16 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                 </span>
               </div>
               <button
-                class="bp3-button bp3-disabled"
+                class="bp4-button bp4-disabled"
                 disabled=""
                 tabindex="-1"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-trash"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-trash"
                   icon="trash"
+                  tabindex="0"
                 >
                   <svg
                     data-icon="trash"
@@ -1263,9 +1249,6 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      trash
-                    </desc>
                     <path
                       d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
                       fill-rule="evenodd"
@@ -1275,18 +1258,20 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
               </button>
             </div>
             <div
-              class="bp3-form-group right"
+              class="bp4-form-group right"
             >
               <div
-                class="bp3-form-content"
+                class="bp4-form-content"
               >
                 <button
-                  class="bp3-button bp3-minimal"
+                  class="bp4-button bp4-minimal"
                   type="button"
                 >
                   <span
-                    class="bp3-icon bp3-icon-plus"
+                    aria-hidden="true"
+                    class="bp4-icon bp4-icon-plus"
                     icon="plus"
+                    tabindex="-1"
                   >
                     <svg
                       data-icon="plus"
@@ -1294,9 +1279,6 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                     >
-                      <desc>
-                        plus
-                      </desc>
                       <path
                         d="M13 7H9V3c0-.55-.45-1-1-1s-1 .45-1 1v4H3c-.55 0-1 .45-1 1s.45 1 1 1h4v4c0 .55.45 1 1 1s1-.45 1-1V9h4c.55 0 1-.45 1-1s-.45-1-1-1z"
                         fill-rule="evenodd"
@@ -1304,7 +1286,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
                     </svg>
                   </span>
                   <span
-                    class="bp3-button-text"
+                    class="bp4-button-text"
                   >
                     Add a tier
                   </span>
@@ -1327,16 +1309,17 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
     class="title"
   >
     <button
-      class="bp3-button bp3-minimal left"
+      class="bp4-button bp4-minimal left"
       type="button"
     >
       <span
-        class="bp3-button-text"
+        class="bp4-button-text"
       >
         loadByInterval(2010-01-01/2015-01-01)
       </span>
       <span
-        class="bp3-icon bp3-icon-caret-down"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-caret-down"
         icon="caret-down"
       >
         <svg
@@ -1345,9 +1328,6 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            caret-down
-          </desc>
           <path
             d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
             fill-rule="evenodd"
@@ -1359,12 +1339,14 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
       class="spacer"
     />
     <button
-      class="bp3-button bp3-minimal"
+      class="bp4-button bp4-minimal"
       type="button"
     >
       <span
-        class="bp3-icon bp3-icon-trash"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-trash"
         icon="trash"
+        tabindex="0"
       >
         <svg
           data-icon="trash"
@@ -1372,9 +1354,6 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            trash
-          </desc>
           <path
             d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
             fill-rule="evenodd"
@@ -1384,28 +1363,28 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
     </button>
   </div>
   <div
-    class="bp3-collapse"
+    class="bp4-collapse"
     style="height: auto; overflow-y: visible; transition: none;"
   >
     <div
       aria-hidden="false"
-      class="bp3-collapse-body"
+      class="bp4-collapse-body"
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp3-card bp3-elevation-2"
+        class="bp4-card bp4-elevation-2"
       >
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <div
-                class="bp3-html-select"
+                class="bp4-html-select"
               >
                 <select>
                   <option
@@ -1460,7 +1439,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -1470,7 +1449,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -1480,10 +1459,10 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                 </span>
               </div>
               <div
-                class="bp3-input-group"
+                class="bp4-input-group"
               >
                 <input
-                  class="bp3-input"
+                  class="bp4-input"
                   placeholder="2010-01-01/2020-01-01"
                   type="text"
                   value=""
@@ -1493,34 +1472,34 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
           </div>
         </div>
         <div
-          class="bp3-form-group"
+          class="bp4-form-group"
         >
           <div
-            class="bp3-form-content"
+            class="bp4-form-content"
           >
             <div
-              class="bp3-control-group"
+              class="bp4-control-group"
             >
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Replicants:
                 </span>
               </button>
               <div
-                class="bp3-control-group bp3-numeric-input"
+                class="bp4-control-group bp4-numeric-input"
               >
                 <div
-                  class="bp3-input-group"
+                  class="bp4-input-group"
                 >
                   <input
                     autocomplete="off"
-                    class="bp3-input"
+                    class="bp4-input"
                     max="256"
                     min="1"
                     type="text"
@@ -1528,15 +1507,18 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                   />
                 </div>
                 <div
-                  class="bp3-button-group bp3-vertical bp3-fixed"
+                  class="bp4-button-group bp4-vertical bp4-fixed"
                 >
                   <button
-                    class="bp3-button"
+                    aria-label="increment"
+                    class="bp4-button"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-up"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-up"
                       icon="chevron-up"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-up"
@@ -1544,9 +1526,6 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-up
-                        </desc>
                         <path
                           d="M12.71 9.29l-4-4C8.53 5.11 8.28 5 8 5s-.53.11-.71.29l-4 4a1.003 1.003 0 001.42 1.42L8 7.41l3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71z"
                           fill-rule="evenodd"
@@ -1555,12 +1534,15 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                     </span>
                   </button>
                   <button
-                    class="bp3-button"
+                    aria-label="decrement"
+                    class="bp4-button"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-chevron-down"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-chevron-down"
                       icon="chevron-down"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="chevron-down"
@@ -1568,9 +1550,6 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          chevron-down
-                        </desc>
                         <path
                           d="M12 5c-.28 0-.53.11-.71.29L8 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42l4 4c.18.18.43.29.71.29s.53-.11.71-.29l4-4A1.003 1.003 0 0012 5z"
                           fill-rule="evenodd"
@@ -1581,18 +1560,18 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                 </div>
               </div>
               <button
-                class="bp3-button bp3-minimal"
+                class="bp4-button bp4-minimal"
                 style="pointer-events: none;"
                 type="button"
               >
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Tier:
                 </span>
               </button>
               <div
-                class="bp3-html-select bp3-fill"
+                class="bp4-html-select bp4-fill"
               >
                 <select>
                   <option
@@ -1617,7 +1596,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                   </option>
                 </select>
                 <span
-                  class="bp3-icon bp3-icon-double-caret-vertical"
+                  class="bp4-icon bp4-icon-double-caret-vertical"
                   icon="double-caret-vertical"
                 >
                   <svg
@@ -1627,7 +1606,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                     width="16"
                   >
                     <desc>
-                      double-caret-vertical
+                      Open dropdown
                     </desc>
                     <path
                       d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -1637,14 +1616,16 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                 </span>
               </div>
               <button
-                class="bp3-button bp3-disabled"
+                class="bp4-button bp4-disabled"
                 disabled=""
                 tabindex="-1"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-trash"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-trash"
                   icon="trash"
+                  tabindex="0"
                 >
                   <svg
                     data-icon="trash"
@@ -1652,9 +1633,6 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      trash
-                    </desc>
                     <path
                       d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
                       fill-rule="evenodd"
@@ -1664,18 +1642,20 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
               </button>
             </div>
             <div
-              class="bp3-form-group right"
+              class="bp4-form-group right"
             >
               <div
-                class="bp3-form-content"
+                class="bp4-form-content"
               >
                 <button
-                  class="bp3-button bp3-minimal"
+                  class="bp4-button bp4-minimal"
                   type="button"
                 >
                   <span
-                    class="bp3-icon bp3-icon-plus"
+                    aria-hidden="true"
+                    class="bp4-icon bp4-icon-plus"
                     icon="plus"
+                    tabindex="-1"
                   >
                     <svg
                       data-icon="plus"
@@ -1683,9 +1663,6 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                     >
-                      <desc>
-                        plus
-                      </desc>
                       <path
                         d="M13 7H9V3c0-.55-.45-1-1-1s-1 .45-1 1v4H3c-.55 0-1 .45-1 1s.45 1 1 1h4v4c0 .55.45 1 1 1s1-.45 1-1V9h4c.55 0 1-.45 1-1s-.45-1-1-1z"
                         fill-rule="evenodd"
@@ -1693,7 +1670,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
                     </svg>
                   </span>
                   <span
-                    class="bp3-button-text"
+                    class="bp4-button-text"
                   >
                     Add a tier
                   </span>
diff --git a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
index 5f76670f14..64e6479637 100644
--- a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
+++ b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
@@ -43,36 +43,36 @@ exports[`SegmentTimeline matches snapshot 1`] = `
     class="side-control"
   >
     <div
-      class="bp3-form-group"
+      class="bp4-form-group"
     >
       <div
-        class="bp3-form-content"
+        class="bp4-form-content"
       >
         <div>
           <label
-            class="bp3-control bp3-radio"
+            class="bp4-control bp4-radio"
           >
             <input
               checked=""
-              name="Blueprint3.RadioGroup-0"
+              name="Blueprint4.RadioGroup-0"
               type="radio"
               value="sizeData"
             />
             <span
-              class="bp3-control-indicator"
+              class="bp4-control-indicator"
             />
             Total size
           </label>
           <label
-            class="bp3-control bp3-radio"
+            class="bp4-control bp4-radio"
           >
             <input
-              name="Blueprint3.RadioGroup-0"
+              name="Blueprint4.RadioGroup-0"
               type="radio"
               value="countData"
             />
             <span
-              class="bp3-control-indicator"
+              class="bp4-control-indicator"
             />
             Segment count
           </label>
@@ -80,22 +80,22 @@ exports[`SegmentTimeline matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bp3-form-group"
+      class="bp4-form-group"
     >
       <label
-        class="bp3-label"
+        class="bp4-label"
       >
         Datasource
          
         <span
-          class="bp3-text-muted"
+          class="bp4-text-muted"
         />
       </label>
       <div
-        class="bp3-form-content"
+        class="bp4-form-content"
       >
         <div
-          class="bp3-html-select bp3-fill"
+          class="bp4-html-select bp4-fill"
         >
           <select>
             <option
@@ -105,7 +105,7 @@ exports[`SegmentTimeline matches snapshot 1`] = `
             </option>
           </select>
           <span
-            class="bp3-icon bp3-icon-double-caret-vertical"
+            class="bp4-icon bp4-icon-double-caret-vertical"
             icon="double-caret-vertical"
           >
             <svg
@@ -115,7 +115,7 @@ exports[`SegmentTimeline matches snapshot 1`] = `
               width="16"
             >
               <desc>
-                double-caret-vertical
+                Open dropdown
               </desc>
               <path
                 d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -127,45 +127,47 @@ exports[`SegmentTimeline matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bp3-form-group"
+      class="bp4-form-group"
     >
       <label
-        class="bp3-label"
+        class="bp4-label"
       >
         Interval
          
         <span
-          class="bp3-text-muted"
+          class="bp4-text-muted"
         />
       </label>
       <div
-        class="bp3-form-content"
+        class="bp4-form-content"
       >
         <span
-          class="bp3-popover-wrapper date-range-selector"
+          class="bp4-popover-wrapper date-range-selector"
         >
           <span
-            class="bp3-popover-target"
+            aria-haspopup="true"
+            class="bp4-popover-target"
           >
             <div
-              class="bp3-input-group"
+              class="bp4-input-group"
             >
               <input
-                class="bp3-input"
+                class="bp4-input"
                 readonly=""
                 style="padding-right: 0px;"
                 type="text"
                 value="2021-03-09 âž” 2021-06-09"
               />
               <span
-                class="bp3-input-action"
+                class="bp4-input-action"
               >
                 <button
-                  class="bp3-button bp3-minimal"
+                  class="bp4-button bp4-minimal"
                   type="button"
                 >
                   <span
-                    class="bp3-icon bp3-icon-calendar"
+                    aria-hidden="true"
+                    class="bp4-icon bp4-icon-calendar"
                     icon="calendar"
                   >
                     <svg
@@ -174,9 +176,6 @@ exports[`SegmentTimeline matches snapshot 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                     >
-                      <desc>
-                        calendar
-                      </desc>
                       <path
                         d="M11 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1s-1 .4-1 1v1c0 .5.4 1 1 1zm3-2h-1v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H6v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H1c-.6 0-1 .5-1 1v12c0 .6.4 1 1 1h13c.6 0 1-.4 1-1V2c0-.6-.5-1-1-1zM5 13H2v-3h3v3zm0-4H2V6h3v3zm4 4H6v-3h3v3zm0-4H6V6h3v3zm4 4h-3v-3h3v3zm0-4h-3V6h3v3zM4 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1S3 .4 3 1v1c0 .5.4 1 1 1z"
                         fill-rule="evenodd"
diff --git a/web-console/src/components/show-history/show-history.scss b/web-console/src/components/show-history/show-history.scss
index 9975fd7f80..e062642464 100644
--- a/web-console/src/components/show-history/show-history.scss
+++ b/web-console/src/components/show-history/show-history.scss
@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .show-history {
   position: relative;
   height: 100%;
 
-  .bp3-tabs {
+  .#{$bp-ns}-tabs {
     position: relative;
     height: 100%;
   }
@@ -30,7 +32,7 @@
     width: 100%;
   }
 
-  .bp3-tab-list {
+  .#{$bp-ns}-tab-list {
     overflow-y: auto;
   }
 }
diff --git a/web-console/src/components/show-json/__snapshots__/show-json.spec.tsx.snap b/web-console/src/components/show-json/__snapshots__/show-json.spec.tsx.snap
index 592855cb9b..6c15206443 100644
--- a/web-console/src/components/show-json/__snapshots__/show-json.spec.tsx.snap
+++ b/web-console/src/components/show-json/__snapshots__/show-json.spec.tsx.snap
@@ -8,40 +8,40 @@ exports[`ShowJson matches snapshot 1`] = `
     class="top-actions"
   >
     <div
-      class="bp3-button-group right-buttons"
+      class="bp4-button-group right-buttons"
     >
       <button
-        class="bp3-button bp3-disabled bp3-minimal"
+        class="bp4-button bp4-disabled bp4-minimal"
         disabled=""
         tabindex="-1"
         type="button"
       >
         <span
-          class="bp3-button-text"
+          class="bp4-button-text"
         >
           Save
         </span>
       </button>
       <button
-        class="bp3-button bp3-disabled bp3-minimal"
+        class="bp4-button bp4-disabled bp4-minimal"
         disabled=""
         tabindex="-1"
         type="button"
       >
         <span
-          class="bp3-button-text"
+          class="bp4-button-text"
         >
           Copy
         </span>
       </button>
       <button
-        class="bp3-button bp3-disabled bp3-minimal"
+        class="bp4-button bp4-disabled bp4-minimal"
         disabled=""
         tabindex="-1"
         type="button"
       >
         <span
-          class="bp3-button-text"
+          class="bp4-button-text"
         >
           View raw
         </span>
diff --git a/web-console/src/components/show-log/__snapshots__/show-log.spec.tsx.snap b/web-console/src/components/show-log/__snapshots__/show-log.spec.tsx.snap
index 5963d8d52d..9b79c68364 100644
--- a/web-console/src/components/show-log/__snapshots__/show-log.spec.tsx.snap
+++ b/web-console/src/components/show-log/__snapshots__/show-log.spec.tsx.snap
@@ -8,49 +8,49 @@ exports[`ShowLog describe show log 1`] = `
     class="top-actions"
   >
     <label
-      class="bp3-control bp3-switch tail-log"
+      class="bp4-control bp4-switch tail-log"
     >
       <input
         checked=""
         type="checkbox"
       />
       <span
-        class="bp3-control-indicator"
+        class="bp4-control-indicator"
       />
       Tail log
     </label>
     <div
-      class="bp3-button-group right-buttons"
+      class="bp4-button-group right-buttons"
     >
       <a
-        class="bp3-button bp3-minimal"
+        class="bp4-button bp4-minimal"
         download="test"
         href="/some/base_url/druid/index/test/log"
         role="button"
         tabindex="0"
       >
         <span
-          class="bp3-button-text"
+          class="bp4-button-text"
         >
           Save
         </span>
       </a>
       <button
-        class="bp3-button bp3-minimal"
+        class="bp4-button bp4-minimal"
         type="button"
       >
         <span
-          class="bp3-button-text"
+          class="bp4-button-text"
         >
           Copy
         </span>
       </button>
       <button
-        class="bp3-button bp3-minimal"
+        class="bp4-button bp4-minimal"
         type="button"
       >
         <span
-          class="bp3-button-text"
+          class="bp4-button-text"
         >
           View full log
         </span>
diff --git a/web-console/src/components/show-value/__snapshots__/show-value.spec.tsx.snap b/web-console/src/components/show-value/__snapshots__/show-value.spec.tsx.snap
index e9615da3eb..79d9d61461 100644
--- a/web-console/src/components/show-value/__snapshots__/show-value.spec.tsx.snap
+++ b/web-console/src/components/show-value/__snapshots__/show-value.spec.tsx.snap
@@ -8,14 +8,14 @@ exports[`ShowValue matches snapshot 1`] = `
     class="top-actions"
   >
     <div
-      class="bp3-button-group right-buttons"
+      class="bp4-button-group right-buttons"
     >
       <button
-        class="bp3-button bp3-minimal"
+        class="bp4-button bp4-minimal"
         type="button"
       >
         <span
-          class="bp3-button-text"
+          class="bp4-button-text"
         >
           Save
         </span>
@@ -26,7 +26,7 @@ exports[`ShowValue matches snapshot 1`] = `
     class="main-area"
   >
     <textarea
-      class="bp3-input"
+      class="bp4-input"
       readonly=""
     >
       { hello: 'world' }
diff --git a/web-console/src/components/suggestible-input/__snapshots__/suggestible-input.spec.tsx.snap b/web-console/src/components/suggestible-input/__snapshots__/suggestible-input.spec.tsx.snap
index 6db0dccc21..59028250f9 100644
--- a/web-console/src/components/suggestible-input/__snapshots__/suggestible-input.spec.tsx.snap
+++ b/web-console/src/components/suggestible-input/__snapshots__/suggestible-input.spec.tsx.snap
@@ -5,27 +5,30 @@ exports[`SuggestibleInput matches snapshot 1`] = `
   class="formatted-input suggestible-input"
 >
   <div
-    class="bp3-input-group"
+    class="bp4-input-group"
   >
     <input
-      class="bp3-input"
+      class="bp4-input"
       style="padding-right: 0px;"
       type="text"
       value=""
     />
     <span
-      class="bp3-input-action"
+      class="bp4-input-action"
     >
       <span
-        class="bp3-popover2-target"
+        aria-haspopup="true"
+        class="bp4-popover2-target"
       >
         <button
-          class="bp3-button bp3-minimal"
+          class="bp4-button bp4-minimal"
           type="button"
         >
           <span
-            class="bp3-icon bp3-icon-caret-down"
+            aria-hidden="true"
+            class="bp4-icon bp4-icon-caret-down"
             icon="caret-down"
+            tabindex="0"
           >
             <svg
               data-icon="caret-down"
@@ -33,9 +36,6 @@ exports[`SuggestibleInput matches snapshot 1`] = `
               viewBox="0 0 16 16"
               width="16"
             >
-              <desc>
-                caret-down
-              </desc>
               <path
                 d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                 fill-rule="evenodd"
@@ -54,27 +54,30 @@ exports[`SuggestibleInput matches snapshot with escaped value 1`] = `
   class="formatted-input suggestible-input"
 >
   <div
-    class="bp3-input-group"
+    class="bp4-input-group"
   >
     <input
-      class="bp3-input"
+      class="bp4-input"
       style="padding-right: 0px;"
       type="text"
       value="Here are some chars \\\\t\\\\r\\\\n lol"
     />
     <span
-      class="bp3-input-action"
+      class="bp4-input-action"
     >
       <span
-        class="bp3-popover2-target"
+        aria-haspopup="true"
+        class="bp4-popover2-target"
       >
         <button
-          class="bp3-button bp3-minimal"
+          class="bp4-button bp4-minimal"
           type="button"
         >
           <span
-            class="bp3-icon bp3-icon-caret-down"
+            aria-hidden="true"
+            class="bp4-icon bp4-icon-caret-down"
             icon="caret-down"
+            tabindex="0"
           >
             <svg
               data-icon="caret-down"
@@ -82,9 +85,6 @@ exports[`SuggestibleInput matches snapshot with escaped value 1`] = `
               viewBox="0 0 16 16"
               width="16"
             >
-              <desc>
-                caret-down
-              </desc>
               <path
                 d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                 fill-rule="evenodd"
diff --git a/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap b/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap
index 8897e38ec5..3fcd5305d8 100644
--- a/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap
+++ b/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap
@@ -2,16 +2,17 @@
 
 exports[`SuggestionMenu matches snapshot 1`] = `
 <ul
-  class="bp3-menu suggestion-menu"
+  class="bp4-menu suggestion-menu"
 >
   <li
     class=""
   >
     <a
-      class="bp3-menu-item bp3-popover-dismiss"
+      class="bp4-menu-item bp4-popover-dismiss"
+      tabindex="0"
     >
       <div
-        class="bp3-text-overflow-ellipsis bp3-fill"
+        class="bp4-fill bp4-text-overflow-ellipsis"
       >
         dog
       </div>
@@ -21,10 +22,11 @@ exports[`SuggestionMenu matches snapshot 1`] = `
     class=""
   >
     <a
-      class="bp3-menu-item bp3-popover-dismiss"
+      class="bp4-menu-item bp4-popover-dismiss"
+      tabindex="0"
     >
       <div
-        class="bp3-text-overflow-ellipsis bp3-fill"
+        class="bp4-fill bp4-text-overflow-ellipsis"
       >
         cat
       </div>
@@ -34,35 +36,37 @@ exports[`SuggestionMenu matches snapshot 1`] = `
     class=""
   >
     <a
-      class="bp3-menu-item bp3-popover-dismiss"
+      class="bp4-menu-item bp4-popover-dismiss"
+      tabindex="0"
     >
       <div
-        class="bp3-text-overflow-ellipsis bp3-fill"
+        class="bp4-fill bp4-text-overflow-ellipsis"
       >
         skunk
       </div>
     </a>
   </li>
   <li
-    class="bp3-submenu"
+    class="bp4-submenu"
   >
     <span
-      class="bp3-popover-wrapper"
+      class="bp4-popover-wrapper"
     >
       <span
-        class="bp3-popover-target"
+        aria-haspopup="true"
+        class="bp4-popover-target"
       >
         <a
-          class="bp3-menu-item"
+          class="bp4-menu-item"
           tabindex="0"
         >
           <div
-            class="bp3-text-overflow-ellipsis bp3-fill"
+            class="bp4-fill bp4-text-overflow-ellipsis"
           >
             Fruit
           </div>
           <span
-            class="bp3-icon bp3-icon-caret-right"
+            class="bp4-icon bp4-icon-caret-right bp4-submenu-icon"
             icon="caret-right"
           >
             <svg
@@ -72,7 +76,7 @@ exports[`SuggestionMenu matches snapshot 1`] = `
               width="16"
             >
               <desc>
-                caret-right
+                Open sub menu
               </desc>
               <path
                 d="M11 8c0-.15-.07-.28-.17-.37l-4-3.5A.495.495 0 006 4.5v7a.495.495 0 00.83.37l4-3.5c.1-.09.17-.22.17-.37z"
diff --git a/web-console/src/components/supervisor-statistics-table/__snapshots__/supervisor-statistics-table.spec.tsx.snap b/web-console/src/components/supervisor-statistics-table/__snapshots__/supervisor-statistics-table.spec.tsx.snap
index 4e8a5737a1..8b93d8d9ec 100644
--- a/web-console/src/components/supervisor-statistics-table/__snapshots__/supervisor-statistics-table.spec.tsx.snap
+++ b/web-console/src/components/supervisor-statistics-table/__snapshots__/supervisor-statistics-table.spec.tsx.snap
@@ -7,16 +7,16 @@ exports[`SupervisorStatisticsTable matches snapshot on error 1`] = `
   <div
     className="top-actions"
   >
-    <Blueprint3.ButtonGroup
+    <Blueprint4.ButtonGroup
       className="right-buttons"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         minimal={true}
         onClick={[Function]}
         text="View raw"
       />
-    </Blueprint3.ButtonGroup>
+    </Blueprint4.ButtonGroup>
   </div>
   <div
     className="main-area"
@@ -181,16 +181,16 @@ exports[`SupervisorStatisticsTable matches snapshot on init 1`] = `
   <div
     className="top-actions"
   >
-    <Blueprint3.ButtonGroup
+    <Blueprint4.ButtonGroup
       className="right-buttons"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         minimal={true}
         onClick={[Function]}
         text="View raw"
       />
-    </Blueprint3.ButtonGroup>
+    </Blueprint4.ButtonGroup>
   </div>
   <div
     className="main-area"
@@ -355,16 +355,16 @@ exports[`SupervisorStatisticsTable matches snapshot on loading 1`] = `
   <div
     className="top-actions"
   >
-    <Blueprint3.ButtonGroup
+    <Blueprint4.ButtonGroup
       className="right-buttons"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={true}
         minimal={true}
         onClick={[Function]}
         text="View raw"
       />
-    </Blueprint3.ButtonGroup>
+    </Blueprint4.ButtonGroup>
   </div>
   <div
     className="main-area"
@@ -381,16 +381,16 @@ exports[`SupervisorStatisticsTable matches snapshot on no data 1`] = `
   <div
     className="top-actions"
   >
-    <Blueprint3.ButtonGroup
+    <Blueprint4.ButtonGroup
       className="right-buttons"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         minimal={true}
         onClick={[Function]}
         text="View raw"
       />
-    </Blueprint3.ButtonGroup>
+    </Blueprint4.ButtonGroup>
   </div>
   <div
     className="main-area"
@@ -555,16 +555,16 @@ exports[`SupervisorStatisticsTable matches snapshot on some data 1`] = `
   <div
     className="top-actions"
   >
-    <Blueprint3.ButtonGroup
+    <Blueprint4.ButtonGroup
       className="right-buttons"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         minimal={true}
         onClick={[Function]}
         text="View raw"
       />
-    </Blueprint3.ButtonGroup>
+    </Blueprint4.ButtonGroup>
   </div>
   <div
     className="main-area"
diff --git a/web-console/src/components/table-cell/__snapshots__/table-cell.spec.tsx.snap b/web-console/src/components/table-cell/__snapshots__/table-cell.spec.tsx.snap
index c10cb5e633..caf2d56db5 100644
--- a/web-console/src/components/table-cell/__snapshots__/table-cell.spec.tsx.snap
+++ b/web-console/src/components/table-cell/__snapshots__/table-cell.spec.tsx.snap
@@ -12,7 +12,8 @@ exports[`TableCell matches snapshot array long 1`] = `
   </span>
   7, 98, 99]
   <span
-    class="bp3-icon bp3-icon-more action-icon"
+    aria-hidden="true"
+    class="bp4-icon bp4-icon-more action-icon"
     icon="more"
   >
     <svg
@@ -21,9 +22,6 @@ exports[`TableCell matches snapshot array long 1`] = `
       viewBox="0 0 16 16"
       width="16"
     >
-      <desc>
-        more
-      </desc>
       <path
         d="M2 6.03a2 2 0 100 4 2 2 0 100-4zM14 6.03a2 2 0 100 4 2 2 0 100-4zM8 6.03a2 2 0 100 4 2 2 0 100-4z"
         fill-rule="evenodd"
@@ -77,7 +75,8 @@ exports[`TableCell matches snapshot truncate 1`] = `
   </span>
   test_test_
   <span
-    class="bp3-icon bp3-icon-more action-icon"
+    aria-hidden="true"
+    class="bp4-icon bp4-icon-more action-icon"
     icon="more"
   >
     <svg
@@ -86,9 +85,6 @@ exports[`TableCell matches snapshot truncate 1`] = `
       viewBox="0 0 16 16"
       width="16"
     >
-      <desc>
-        more
-      </desc>
       <path
         d="M2 6.03a2 2 0 100 4 2 2 0 100-4zM14 6.03a2 2 0 100 4 2 2 0 100-4zM8 6.03a2 2 0 100 4 2 2 0 100-4z"
         fill-rule="evenodd"
diff --git a/web-console/src/components/table-column-selector/__snapshots__/table-column-selector.spec.tsx.snap b/web-console/src/components/table-column-selector/__snapshots__/table-column-selector.spec.tsx.snap
index 538260d850..412219db0b 100644
--- a/web-console/src/components/table-column-selector/__snapshots__/table-column-selector.spec.tsx.snap
+++ b/web-console/src/components/table-column-selector/__snapshots__/table-column-selector.spec.tsx.snap
@@ -2,14 +2,15 @@
 
 exports[`TableColumnSelector matches snapshot 1`] = `
 <span
-  class="table-column-selector bp3-popover2-target"
+  aria-haspopup="true"
+  class="table-column-selector bp4-popover2-target"
 >
   <button
-    class="bp3-button"
+    class="bp4-button"
     type="button"
   >
     <span
-      class="bp3-button-text"
+      class="bp4-button-text"
     >
       Columns 
       <span
@@ -19,7 +20,8 @@ exports[`TableColumnSelector matches snapshot 1`] = `
       </span>
     </span>
     <span
-      class="bp3-icon bp3-icon-caret-down"
+      aria-hidden="true"
+      class="bp4-icon bp4-icon-caret-down"
       icon="caret-down"
     >
       <svg
@@ -28,9 +30,6 @@ exports[`TableColumnSelector matches snapshot 1`] = `
         viewBox="0 0 16 16"
         width="16"
       >
-        <desc>
-          caret-down
-        </desc>
         <path
           d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
           fill-rule="evenodd"
diff --git a/web-console/src/components/table-column-selector/table-column-selector.scss b/web-console/src/components/table-column-selector/table-column-selector.scss
index 4cefabf900..f0c47723ab 100644
--- a/web-console/src/components/table-column-selector/table-column-selector.scss
+++ b/web-console/src/components/table-column-selector/table-column-selector.scss
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .table-column-selector {
   position: absolute;
   right: 0;
@@ -28,7 +30,7 @@
 
 // This will be mounted in a portal
 .table-column-selector-menu {
-  .bp3-form-group {
+  .#{$bp-ns}-form-group {
     margin-bottom: 0;
   }
 }
diff --git a/web-console/src/components/timed-button/__snapshots__/timed-button.spec.tsx.snap b/web-console/src/components/timed-button/__snapshots__/timed-button.spec.tsx.snap
index 4f88968e75..a060f5a72f 100644
--- a/web-console/src/components/timed-button/__snapshots__/timed-button.spec.tsx.snap
+++ b/web-console/src/components/timed-button/__snapshots__/timed-button.spec.tsx.snap
@@ -1,30 +1,32 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`TimedButton matches snapshot 1`] = `
-<Blueprint3.ButtonGroup
+<Blueprint4.ButtonGroup
   className="timed-button"
 >
-  <Blueprint3.Button
+  <Blueprint4.Button
     onClick={[Function]}
   />
-  <Blueprint3.Popover2
+  <Blueprint4.Popover2
     boundary="clippingParents"
     captureDismiss={false}
     content={
-      <Blueprint3.Menu>
-        <Blueprint3.MenuDivider
+      <Blueprint4.Menu>
+        <Blueprint4.MenuDivider
           title="Select delay"
         />
-        <Blueprint3.MenuItem
+        <Blueprint4.MenuItem
+          active={false}
           disabled={false}
           icon="selection"
           multiline={false}
           onClick={[Function]}
           popoverProps={Object {}}
+          selected={false}
           shouldDismissPopover={true}
           text="timeValue"
         />
-      </Blueprint3.Menu>
+      </Blueprint4.Menu>
     }
     defaultIsOpen={false}
     disabled={false}
@@ -37,13 +39,14 @@ exports[`TimedButton matches snapshot 1`] = `
     minimal={false}
     openOnTargetFocus={true}
     positioningStrategy="absolute"
+    shouldReturnFocusOnClose={false}
     targetTagName="span"
     transitionDuration={300}
     usePortal={true}
   >
-    <Blueprint3.Button
+    <Blueprint4.Button
       rightIcon="caret-down"
     />
-  </Blueprint3.Popover2>
-</Blueprint3.ButtonGroup>
+  </Blueprint4.Popover2>
+</Blueprint4.ButtonGroup>
 `;
diff --git a/web-console/src/components/view-control-bar/view-control-bar.scss b/web-console/src/components/view-control-bar/view-control-bar.scss
index 8b4b71a224..54529e334d 100644
--- a/web-console/src/components/view-control-bar/view-control-bar.scss
+++ b/web-console/src/components/view-control-bar/view-control-bar.scss
@@ -36,8 +36,8 @@
     margin-right: 20px;
   }
 
-  label.bp3-control,
-  label.bp3-label {
+  label.#{$bp-ns}-control,
+  label.#{$bp-ns}-label {
     display: inline-block;
     margin-bottom: 0;
     line-height: 30px;
diff --git a/web-console/src/components/warning-checklist/__snapshots__/warning-checklist.spec.tsx.snap b/web-console/src/components/warning-checklist/__snapshots__/warning-checklist.spec.tsx.snap
index c7e8b5306f..4112eb4584 100644
--- a/web-console/src/components/warning-checklist/__snapshots__/warning-checklist.spec.tsx.snap
+++ b/web-console/src/components/warning-checklist/__snapshots__/warning-checklist.spec.tsx.snap
@@ -5,35 +5,35 @@ exports[`WarningChecklist matches snapshot 1`] = `
   class="warning-checklist"
 >
   <label
-    class="bp3-control bp3-switch"
+    class="bp4-control bp4-switch"
   >
     <input
       type="checkbox"
     />
     <span
-      class="bp3-control-indicator"
+      class="bp4-control-indicator"
     />
     Check A
   </label>
   <label
-    class="bp3-control bp3-switch"
+    class="bp4-control bp4-switch"
   >
     <input
       type="checkbox"
     />
     <span
-      class="bp3-control-indicator"
+      class="bp4-control-indicator"
     />
     Check B
   </label>
   <label
-    class="bp3-control bp3-switch"
+    class="bp4-control bp4-switch"
   >
     <input
       type="checkbox"
     />
     <span
-      class="bp3-control-indicator"
+      class="bp4-control-indicator"
     />
     I am totes sure
   </label>
diff --git a/web-console/src/dialogs/about-dialog/__snapshots__/about-dialog.spec.tsx.snap b/web-console/src/dialogs/about-dialog/__snapshots__/about-dialog.spec.tsx.snap
index 2b8d5ae119..04084c9f97 100644
--- a/web-console/src/dialogs/about-dialog/__snapshots__/about-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/about-dialog/__snapshots__/about-dialog.spec.tsx.snap
@@ -2,28 +2,35 @@
 
 exports[`AboutDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog about-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog about-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <span
-            class="bp3-icon bp3-icon-graph"
+            aria-hidden="true"
+            class="bp4-icon bp4-icon-graph"
             icon="graph"
+            tabindex="-1"
           >
             <svg
               data-icon="graph"
@@ -31,9 +38,6 @@ exports[`AboutDialog matches snapshot 1`] = `
               viewBox="0 0 20 20"
               width="20"
             >
-              <desc>
-                graph
-              </desc>
               <path
                 d="M17.5 4A2.5 2.5 0 0015 6.5c0 .06.01.12.02.18l-1.9.84C12.38 6.6 11.27 6 10 6c-.83 0-1.59.25-2.23.68L4.91 4.14c.05-.21.09-.42.09-.64a2.5 2.5 0 00-5 0A2.5 2.5 0 002.5 6c.42 0 .81-.11 1.16-.3l2.79 2.48C6.17 8.73 6 9.34 6 10c0 1.41.73 2.64 1.83 3.35l-.56 1.67A2.498 2.498 0 005 17.5a2.5 2.5 0 005 0c0-.74-.32-1.39-.83-1.85l.56-1.68c.09.01.18.03.27.03 2.21 0 4-1.79 4-4 0-.22-.03-.44-.07-.65l2.02-.9c.43.34.96.55 1.55.55a2.5 2.5 0 000-5z"
                 fill-rule="evenodd"
@@ -41,17 +45,19 @@ exports[`AboutDialog matches snapshot 1`] = `
             </svg>
           </span>
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Apache Druid
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -60,9 +66,6 @@ exports[`AboutDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -72,7 +75,7 @@ exports[`AboutDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <p>
             <strong>
@@ -114,30 +117,30 @@ exports[`AboutDialog matches snapshot 1`] = `
           </p>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
             </button>
             <a
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               href="https://druid.apache.org"
               role="button"
               tabindex="0"
               target="_blank"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Visit Druid
               </span>
@@ -146,6 +149,10 @@ exports[`AboutDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/async-action-dialog/__snapshots__/async-action-dialog.spec.tsx.snap b/web-console/src/dialogs/async-action-dialog/__snapshots__/async-action-dialog.spec.tsx.snap
index f16f233108..a48a26b177 100644
--- a/web-console/src/dialogs/async-action-dialog/__snapshots__/async-action-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/async-action-dialog/__snapshots__/async-action-dialog.spec.tsx.snap
@@ -2,48 +2,52 @@
 
 exports[`AsyncActionDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog bp3-alert async-action-dialog"
+        class="bp4-dialog bp4-alert async-action-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-alert-body"
+          class="bp4-alert-body"
         >
           <div
-            class="bp3-alert-contents"
+            class="bp4-alert-contents"
           />
         </div>
         <div
-          class="bp3-alert-footer"
+          class="bp4-alert-footer"
         >
           <button
-            class="bp3-button"
+            class="bp4-button"
             type="button"
           >
             <span
-              class="bp3-button-text"
+              class="bp4-button-text"
             >
               test
             </span>
           </button>
           <button
-            class="bp3-button"
+            class="bp4-button"
             type="button"
           >
             <span
-              class="bp3-button-text"
+              class="bp4-button-text"
             >
               Cancel
             </span>
@@ -51,6 +55,10 @@ exports[`AsyncActionDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/compaction-dialog/__snapshots__/compaction-dialog.spec.tsx.snap b/web-console/src/dialogs/compaction-dialog/__snapshots__/compaction-dialog.spec.tsx.snap
index 898acd1b3d..888ee17ef3 100644
--- a/web-console/src/dialogs/compaction-dialog/__snapshots__/compaction-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/compaction-dialog/__snapshots__/compaction-dialog.spec.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CompactionDialog matches snapshot with compactionConfig (dynamic partitionsSpec) 1`] = `
-<Blueprint3.Dialog
+<Blueprint4.Dialog
   canOutsideClickClose={false}
   className="compaction-dialog"
   isOpen={true}
@@ -337,21 +337,21 @@ exports[`CompactionDialog matches snapshot with compactionConfig (dynamic partit
     />
   </div>
   <div
-    className="bp3-dialog-footer"
+    className="bp4-dialog-footer"
   >
     <div
-      className="bp3-dialog-footer-actions"
+      className="bp4-dialog-footer-actions"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         intent="danger"
         onClick={[Function]}
         text="Delete"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         onClick={[Function]}
         text="Close"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         intent="primary"
         onClick={[Function]}
@@ -359,11 +359,11 @@ exports[`CompactionDialog matches snapshot with compactionConfig (dynamic partit
       />
     </div>
   </div>
-</Blueprint3.Dialog>
+</Blueprint4.Dialog>
 `;
 
 exports[`CompactionDialog matches snapshot with compactionConfig (hashed partitionsSpec) 1`] = `
-<Blueprint3.Dialog
+<Blueprint4.Dialog
   canOutsideClickClose={false}
   className="compaction-dialog"
   isOpen={true}
@@ -699,21 +699,21 @@ exports[`CompactionDialog matches snapshot with compactionConfig (hashed partiti
     />
   </div>
   <div
-    className="bp3-dialog-footer"
+    className="bp4-dialog-footer"
   >
     <div
-      className="bp3-dialog-footer-actions"
+      className="bp4-dialog-footer-actions"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         intent="danger"
         onClick={[Function]}
         text="Delete"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         onClick={[Function]}
         text="Close"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         intent="primary"
         onClick={[Function]}
@@ -721,11 +721,11 @@ exports[`CompactionDialog matches snapshot with compactionConfig (hashed partiti
       />
     </div>
   </div>
-</Blueprint3.Dialog>
+</Blueprint4.Dialog>
 `;
 
 exports[`CompactionDialog matches snapshot with compactionConfig (range partitionsSpec) 1`] = `
-<Blueprint3.Dialog
+<Blueprint4.Dialog
   canOutsideClickClose={false}
   className="compaction-dialog"
   isOpen={true}
@@ -1061,21 +1061,21 @@ exports[`CompactionDialog matches snapshot with compactionConfig (range partitio
     />
   </div>
   <div
-    className="bp3-dialog-footer"
+    className="bp4-dialog-footer"
   >
     <div
-      className="bp3-dialog-footer-actions"
+      className="bp4-dialog-footer-actions"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         intent="danger"
         onClick={[Function]}
         text="Delete"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         onClick={[Function]}
         text="Close"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={true}
         intent="primary"
         onClick={[Function]}
@@ -1083,11 +1083,11 @@ exports[`CompactionDialog matches snapshot with compactionConfig (range partitio
       />
     </div>
   </div>
-</Blueprint3.Dialog>
+</Blueprint4.Dialog>
 `;
 
 exports[`CompactionDialog matches snapshot without compactionConfig 1`] = `
-<Blueprint3.Dialog
+<Blueprint4.Dialog
   canOutsideClickClose={false}
   className="compaction-dialog"
   isOpen={true}
@@ -1423,16 +1423,16 @@ exports[`CompactionDialog matches snapshot without compactionConfig 1`] = `
     />
   </div>
   <div
-    className="bp3-dialog-footer"
+    className="bp4-dialog-footer"
   >
     <div
-      className="bp3-dialog-footer-actions"
+      className="bp4-dialog-footer-actions"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         onClick={[Function]}
         text="Close"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         intent="primary"
         onClick={[Function]}
@@ -1440,5 +1440,5 @@ exports[`CompactionDialog matches snapshot without compactionConfig 1`] = `
       />
     </div>
   </div>
-</Blueprint3.Dialog>
+</Blueprint4.Dialog>
 `;
diff --git a/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss b/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss
index 00cea76f38..e3ca37b14e 100644
--- a/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss
+++ b/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .compaction-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     height: 80vh;
   }
 
diff --git a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss
index 0213e2c930..6ca7505600 100644
--- a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss
+++ b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss
@@ -16,13 +16,15 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .coordinator-dynamic-config-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     margin-top: 5vh;
     top: 5%;
   }
 
-  .bp3-dialog-body {
+  .#{$bp-ns}-dialog-body {
     max-height: 70vh;
 
     .auto-form {
diff --git a/web-console/src/dialogs/datasource-table-action-dialog/__snapshots__/datasource-table-action-dialog.spec.tsx.snap b/web-console/src/dialogs/datasource-table-action-dialog/__snapshots__/datasource-table-action-dialog.spec.tsx.snap
index 6edd680160..4934b0e707 100644
--- a/web-console/src/dialogs/datasource-table-action-dialog/__snapshots__/datasource-table-action-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/datasource-table-action-dialog/__snapshots__/datasource-table-action-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`Datasource table action dialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog table-action-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog table-action-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Datasource: test
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,17 +57,18 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="side-bar"
           >
             <button
-              class="bp3-button bp3-intent-primary tab-button"
+              class="bp4-button bp4-intent-primary tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-list-columns"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-list-columns"
                 icon="list-columns"
               >
                 <svg
@@ -72,9 +77,6 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    list-columns
-                  </desc>
                   <path
                     d="M0 2.973v-.936C0 1.468.46 1.01 1.029 1H7.97C8.541 1 9 1.468 9 2.027v.946C9 3.542 8.53 4 7.971 4H1.03C.459 4 0 3.542 0 2.973zm0 5v-.936C0 6.468.46 6.01 1.029 6H7.97C8.541 6 9 6.468 9 7.027v.946C9 8.542 8.53 9 7.971 9H1.03C.459 9 0 8.542 0 7.973zm0 5v-.936C0 11.468.46 11.01 1.029 11H7.97C8.541 11 9 11.468 9 12.027v.946C9 13.542 8.53 14 7.971 14H1.03C.459 14 0 13.542 0 12.973zm0 5v-.936C0 16.468.46 16.01 1.029 16H7.97C8.541 16 9 16.468 9 17.027v.946C9 18.542 8.53 19 7 [...]
                     fill-rule="evenodd"
@@ -82,7 +84,7 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Columns
               </span>
@@ -135,21 +137,24 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
             class="footer-actions-left"
           >
             <span
-              class="bp3-popover2-target"
+              aria-haspopup="true"
+              class="bp4-popover2-target"
             >
               <button
-                class="bp3-button"
+                class="bp4-button"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-wrench"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-wrench"
                   icon="wrench"
+                  tabindex="-1"
                 >
                   <svg
                     data-icon="wrench"
@@ -157,9 +162,6 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      wrench
-                    </desc>
                     <path
                       d="M15.83 3.7l-3.06 3.05-2.84-.7-.7-2.83L12.29.17a5.004 5.004 0 00-4.83 1.29 4.967 4.967 0 00-1.12 5.36L.58 12.58c-.36.36-.58.86-.58 1.41 0 1.1.9 2 2 2 .55 0 1.05-.22 1.41-.59l5.77-5.77c1.79.69 3.91.33 5.35-1.12 1.32-1.3 1.74-3.15 1.3-4.81z"
                       fill-rule="evenodd"
@@ -167,12 +169,13 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
                   </svg>
                 </span>
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Actions
                 </span>
                 <span
-                  class="bp3-icon bp3-icon-caret-down"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-caret-down"
                   icon="caret-down"
                 >
                   <svg
@@ -181,9 +184,6 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      caret-down
-                    </desc>
                     <path
                       d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                       fill-rule="evenodd"
@@ -194,14 +194,14 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
             </span>
           </div>
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -210,6 +210,10 @@ exports[`Datasource table action dialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/diff-dialog/diff-dialog.scss b/web-console/src/dialogs/diff-dialog/diff-dialog.scss
index 39da1903ab..2bcad85f28 100644
--- a/web-console/src/dialogs/diff-dialog/diff-dialog.scss
+++ b/web-console/src/dialogs/diff-dialog/diff-dialog.scss
@@ -20,12 +20,12 @@
 @import '../../blueprint-overrides/common/colors';
 
 .diff-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     height: 90vh;
     width: 90vw;
   }
 
-  .bp3-dialog-body {
+  .#{$bp-ns}-dialog-body {
     position: relative;
 
     .version-selector-bar {
diff --git a/web-console/src/dialogs/doctor-dialog/__snapshots__/doctor-dialog.spec.tsx.snap b/web-console/src/dialogs/doctor-dialog/__snapshots__/doctor-dialog.spec.tsx.snap
index 792147e4c6..cdf38e105f 100644
--- a/web-console/src/dialogs/doctor-dialog/__snapshots__/doctor-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/doctor-dialog/__snapshots__/doctor-dialog.spec.tsx.snap
@@ -2,27 +2,35 @@
 
 exports[`DoctorDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog doctor-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog doctor-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <span
-            class="bp3-icon bp3-icon-pulse"
+            aria-hidden="true"
+            class="bp4-icon bp4-icon-pulse"
             icon="pulse"
+            tabindex="-1"
           >
             <svg
               data-icon="pulse"
@@ -30,9 +38,6 @@ exports[`DoctorDialog matches snapshot 1`] = `
               viewBox="0 0 20 20"
               width="20"
             >
-              <desc>
-                pulse
-              </desc>
               <path
                 d="M19 10h-2.38L14.9 6.55h-.01c-.17-.32-.5-.55-.89-.55-.43 0-.79.28-.93.66h-.01l-2.75 7.57L7.98 1.82h-.02A.978.978 0 007 1c-.44 0-.8.29-.94.69h-.01L3.28 10H1c-.55 0-1 .45-1 1s.45 1 1 1h3c.44 0 .8-.29.94-.69h.01l1.78-5.34 2.29 12.21h.02c.08.46.47.82.96.82.43 0 .79-.28.93-.66h.01l3.21-8.82.96 1.92h.01c.16.33.49.56.88.56h3c.55 0 1-.45 1-1s-.45-1-1-1z"
                 fill-rule="evenodd"
@@ -40,17 +45,19 @@ exports[`DoctorDialog matches snapshot 1`] = `
             </svg>
           </span>
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Druid Doctor
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -59,9 +66,6 @@ exports[`DoctorDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -71,22 +75,22 @@ exports[`DoctorDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="analyze-bar"
           >
             <div
-              class="bp3-callout diagnosis"
+              class="bp4-callout diagnosis"
             >
               Automated checks to troubleshoot issues with the cluster.
             </div>
             <button
-              class="bp3-button bp3-fill bp3-intent-primary"
+              class="bp4-button bp4-fill bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Analyze Druid cluster
               </span>
@@ -94,17 +98,17 @@ exports[`DoctorDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -113,6 +117,10 @@ exports[`DoctorDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss b/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss
index 7efca3a5d1..1cf48ede32 100644
--- a/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss
+++ b/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss
@@ -16,13 +16,15 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .doctor-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     margin-top: 5vh;
     top: 5%;
   }
 
-  .bp3-dialog-body {
+  .#{$bp-ns}-dialog-body {
     height: 70vh;
     overflow: scroll;
   }
diff --git a/web-console/src/dialogs/edit-context-dialog/__snapshots__/edit-context-dialog.spec.tsx.snap b/web-console/src/dialogs/edit-context-dialog/__snapshots__/edit-context-dialog.spec.tsx.snap
index d85242b055..e3f37cfc0a 100644
--- a/web-console/src/dialogs/edit-context-dialog/__snapshots__/edit-context-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/edit-context-dialog/__snapshots__/edit-context-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`EditContextDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog edit-context-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog edit-context-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Edit query context
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`EditContextDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,34 +57,34 @@ exports[`EditContextDialog matches snapshot 1`] = `
           </button>
         </div>
         <textarea
-          class="bp3-input"
+          class="bp4-input"
         >
           {
 
 }
         </textarea>
         <div
-          class="bp3-dialog-footer-actions"
+          class="bp4-dialog-footer-actions"
         >
           <div
             class="edit-context-dialog-buttons"
           >
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
             </button>
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Save
               </span>
@@ -89,6 +93,10 @@ exports[`EditContextDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss b/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss
index cff40594d9..4cc5ab33b7 100644
--- a/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss
+++ b/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss
@@ -16,17 +16,19 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .edit-context-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     padding-bottom: 10px;
   }
 
-  .bp3-input {
+  .#{$bp-ns}-input {
     margin: 10px;
     height: 400px;
   }
 
-  .bp3-dialog-footer-actions {
+  .#{$bp-ns}-dialog-footer-actions {
     padding: 0px 10px 0px 10px;
     display: grid;
     grid-template-columns: 340px 1fr;
diff --git a/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap b/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap
index 0ad76aacab..6ee82f354b 100644
--- a/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`HistoryDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog history-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog history-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             History
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`HistoryDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,58 +57,58 @@ exports[`HistoryDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
-            class="bp3-tabs bp3-vertical"
+            class="bp4-tabs bp4-vertical"
           >
             <div
-              class="bp3-tab-list"
+              class="bp4-tab-list"
               role="tablist"
             >
               <div
-                class="bp3-tab-indicator-wrapper"
+                class="bp4-tab-indicator-wrapper"
                 style="height: 0px; transform: translateX(0px) translateY(0px); width: 0px; transition: none;"
               >
                 <div
-                  class="bp3-tab-indicator"
+                  class="bp4-tab-indicator"
                 />
               </div>
               <div
-                aria-controls="bp3-tab-panel_undefined_0"
+                aria-controls="bp4-tab-panel_undefined_0"
                 aria-disabled="false"
                 aria-expanded="true"
                 aria-selected="true"
-                class="bp3-tab"
+                class="bp4-tab"
                 data-tab-id="0"
-                id="bp3-tab-title_undefined_0"
+                id="bp4-tab-title_undefined_0"
                 role="tab"
                 tabindex="0"
               >
                 test @ 
               </div>
               <div
-                aria-controls="bp3-tab-panel_undefined_1"
+                aria-controls="bp4-tab-panel_undefined_1"
                 aria-disabled="false"
                 aria-expanded="false"
                 aria-selected="false"
-                class="bp3-tab"
+                class="bp4-tab"
                 data-tab-id="1"
-                id="bp3-tab-title_undefined_1"
+                id="bp4-tab-title_undefined_1"
                 role="tab"
-                tabindex="0"
+                tabindex="-1"
               >
                 test @ 
               </div>
               <div
-                class="bp3-flex-expander"
+                class="bp4-flex-expander"
               />
             </div>
             <div
               aria-hidden="false"
-              aria-labelledby="bp3-tab-title_undefined_0"
-              class="bp3-tab-panel panel"
-              id="bp3-tab-panel_undefined_0"
+              aria-labelledby="bp4-tab-title_undefined_0"
+              class="bp4-tab-panel panel"
+              id="bp4-tab-panel_undefined_0"
               role="tabpanel"
             >
               <div
@@ -114,14 +118,14 @@ exports[`HistoryDialog matches snapshot 1`] = `
                   class="top-actions"
                 >
                   <div
-                    class="bp3-button-group right-buttons"
+                    class="bp4-button-group right-buttons"
                   >
                     <button
-                      class="bp3-button bp3-minimal"
+                      class="bp4-button bp4-minimal"
                       type="button"
                     >
                       <span
-                        class="bp3-button-text"
+                        class="bp4-button-text"
                       >
                         Diff with previous
                       </span>
@@ -132,7 +136,7 @@ exports[`HistoryDialog matches snapshot 1`] = `
                   class="main-area"
                 >
                   <textarea
-                    class="bp3-input"
+                    class="bp4-input"
                     readonly=""
                   >
                     {
@@ -145,18 +149,20 @@ exports[`HistoryDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-arrow-left"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-arrow-left"
                 icon="arrow-left"
+                tabindex="-1"
               >
                 <svg
                   data-icon="arrow-left"
@@ -164,9 +170,6 @@ exports[`HistoryDialog matches snapshot 1`] = `
                   viewBox="0 0 16 16"
                   width="16"
                 >
-                  <desc>
-                    arrow-left
-                  </desc>
                   <path
                     d="M13.99 6.99H4.41L7.7 3.7a1.003 1.003 0 00-1.42-1.42l-5 5a1.014 1.014 0 000 1.42l5 5a1.003 1.003 0 001.42-1.42L4.41 8.99H14c.55 0 1-.45 1-1s-.46-1-1.01-1z"
                     fill-rule="evenodd"
@@ -174,7 +177,7 @@ exports[`HistoryDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Back
               </span>
@@ -183,6 +186,10 @@ exports[`HistoryDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/history-dialog/history-dialog.scss b/web-console/src/dialogs/history-dialog/history-dialog.scss
index bc812eefbb..01c411f783 100644
--- a/web-console/src/dialogs/history-dialog/history-dialog.scss
+++ b/web-console/src/dialogs/history-dialog/history-dialog.scss
@@ -16,19 +16,21 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .history-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     width: 75%;
     top: 5%;
     height: 75vh;
   }
 
-  .bp3-tabs {
+  .#{$bp-ns}-tabs {
     position: relative;
     height: 100%;
     width: 100%;
 
-    .bp3-tab-panel {
+    .#{$bp-ns}-tab-panel {
       flex: 1;
     }
   }
diff --git a/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap b/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
index 1f40459246..1c880e9340 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`LookupEditDialog matches snapshot 1`] = `
-<Blueprint3.Dialog
+<Blueprint4.Dialog
   canEscapeKeyClose={false}
   canOutsideClickClose={true}
   className="lookup-edit-dialog"
@@ -12,18 +12,18 @@ exports[`LookupEditDialog matches snapshot 1`] = `
   <div
     className="content"
   >
-    <Blueprint3.FormGroup
+    <Blueprint4.FormGroup
       label="Name"
     >
-      <Blueprint3.InputGroup
+      <Blueprint4.InputGroup
         disabled={false}
         intent="none"
         onChange={[Function]}
         placeholder="Enter the lookup name"
         value="test"
       />
-    </Blueprint3.FormGroup>
-    <Blueprint3.FormGroup
+    </Blueprint4.FormGroup>
+    <Blueprint4.FormGroup
       label="Tier"
     >
       <HTMLSelect
@@ -43,15 +43,15 @@ exports[`LookupEditDialog matches snapshot 1`] = `
           alt-tier
         </option>
       </HTMLSelect>
-    </Blueprint3.FormGroup>
-    <Blueprint3.FormGroup
+    </Blueprint4.FormGroup>
+    <Blueprint4.FormGroup
       label="Version"
     >
-      <Blueprint3.InputGroup
+      <Blueprint4.InputGroup
         onChange={[Function]}
         placeholder="Enter the lookup version"
         rightElement={
-          <Blueprint3.Button
+          <Blueprint4.Button
             minimal={true}
             onClick={[Function]}
             text="Set to current ISO time"
@@ -59,7 +59,7 @@ exports[`LookupEditDialog matches snapshot 1`] = `
         }
         value="test"
       />
-    </Blueprint3.FormGroup>
+    </Blueprint4.FormGroup>
     <Memo(FormJsonSelector)
       onChange={[Function]}
       tab="form"
@@ -412,16 +412,16 @@ exports[`LookupEditDialog matches snapshot 1`] = `
     />
   </div>
   <div
-    className="bp3-dialog-footer"
+    className="bp4-dialog-footer"
   >
     <div
-      className="bp3-dialog-footer-actions"
+      className="bp4-dialog-footer-actions"
     >
-      <Blueprint3.Button
+      <Blueprint4.Button
         onClick={[Function]}
         text="Close"
       />
-      <Blueprint3.Button
+      <Blueprint4.Button
         disabled={false}
         intent="primary"
         onClick={[Function]}
@@ -429,5 +429,5 @@ exports[`LookupEditDialog matches snapshot 1`] = `
       />
     </div>
   </div>
-</Blueprint3.Dialog>
+</Blueprint4.Dialog>
 `;
diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
index 1e28158f07..b983f0a0c7 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .lookup-edit-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     height: 80vh;
     width: 600px;
   }
diff --git a/web-console/src/dialogs/lookup-table-action-dialog/__snapshots__/lookup-table-action-dialog.spec.tsx.snap b/web-console/src/dialogs/lookup-table-action-dialog/__snapshots__/lookup-table-action-dialog.spec.tsx.snap
index 6db67c7cd8..1b2bd4f656 100644
--- a/web-console/src/dialogs/lookup-table-action-dialog/__snapshots__/lookup-table-action-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/lookup-table-action-dialog/__snapshots__/lookup-table-action-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`Lookup table action dialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog table-action-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog table-action-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Lookup: test
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,17 +57,18 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="side-bar"
           >
             <button
-              class="bp3-button bp3-intent-primary tab-button"
+              class="bp4-button bp4-intent-primary tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-list-columns"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-list-columns"
                 icon="list-columns"
               >
                 <svg
@@ -72,9 +77,6 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    list-columns
-                  </desc>
                   <path
                     d="M0 2.973v-.936C0 1.468.46 1.01 1.029 1H7.97C8.541 1 9 1.468 9 2.027v.946C9 3.542 8.53 4 7.971 4H1.03C.459 4 0 3.542 0 2.973zm0 5v-.936C0 6.468.46 6.01 1.029 6H7.97C8.541 6 9 6.468 9 7.027v.946C9 8.542 8.53 9 7.971 9H1.03C.459 9 0 8.542 0 7.973zm0 5v-.936C0 11.468.46 11.01 1.029 11H7.97C8.541 11 9 11.468 9 12.027v.946C9 13.542 8.53 14 7.971 14H1.03C.459 14 0 13.542 0 12.973zm0 5v-.936C0 16.468.46 16.01 1.029 16H7.97C8.541 16 9 16.468 9 17.027v.946C9 18.542 8.53 19 7 [...]
                     fill-rule="evenodd"
@@ -82,7 +84,7 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Values
               </span>
@@ -135,21 +137,24 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
             class="footer-actions-left"
           >
             <span
-              class="bp3-popover2-target"
+              aria-haspopup="true"
+              class="bp4-popover2-target"
             >
               <button
-                class="bp3-button"
+                class="bp4-button"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-wrench"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-wrench"
                   icon="wrench"
+                  tabindex="-1"
                 >
                   <svg
                     data-icon="wrench"
@@ -157,9 +162,6 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      wrench
-                    </desc>
                     <path
                       d="M15.83 3.7l-3.06 3.05-2.84-.7-.7-2.83L12.29.17a5.004 5.004 0 00-4.83 1.29 4.967 4.967 0 00-1.12 5.36L.58 12.58c-.36.36-.58.86-.58 1.41 0 1.1.9 2 2 2 .55 0 1.05-.22 1.41-.59l5.77-5.77c1.79.69 3.91.33 5.35-1.12 1.32-1.3 1.74-3.15 1.3-4.81z"
                       fill-rule="evenodd"
@@ -167,12 +169,13 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
                   </svg>
                 </span>
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Actions
                 </span>
                 <span
-                  class="bp3-icon bp3-icon-caret-down"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-caret-down"
                   icon="caret-down"
                 >
                   <svg
@@ -181,9 +184,6 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      caret-down
-                    </desc>
                     <path
                       d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                       fill-rule="evenodd"
@@ -194,14 +194,14 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
             </span>
           </div>
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -210,6 +210,10 @@ exports[`Lookup table action dialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss
index f655cc92e4..8829e93b50 100644
--- a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss
+++ b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss
@@ -16,14 +16,16 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .overlord-dynamic-config-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     margin-top: 5vh;
     top: 5%;
     width: 600px;
   }
 
-  .bp3-dialog-body {
+  .#{$bp-ns}-dialog-body {
     max-height: 70vh;
 
     .auto-form {
diff --git a/web-console/src/dialogs/query-history-dialog/__snapshots__/query-history-dialog.spec.tsx.snap b/web-console/src/dialogs/query-history-dialog/__snapshots__/query-history-dialog.spec.tsx.snap
index fcfa242625..49e17a304b 100644
--- a/web-console/src/dialogs/query-history-dialog/__snapshots__/query-history-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/query-history-dialog/__snapshots__/query-history-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`QueryHistoryDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog query-history-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog query-history-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Query history
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`QueryHistoryDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,7 +57,7 @@ exports[`QueryHistoryDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="center-message bp3-input"
@@ -66,17 +70,17 @@ exports[`QueryHistoryDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -85,6 +89,10 @@ exports[`QueryHistoryDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss b/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss
index 8a3eaa7b27..cdf2ce1ec6 100644
--- a/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss
+++ b/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .query-history-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     width: 900px;
   }
 
diff --git a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
index 51392431b8..42df04d3e8 100644
--- a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
@@ -2,36 +2,44 @@
 
 exports[`RetentionDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog snitch-dialog retention-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog snitch-dialog retention-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Edit retention rules: test-datasource
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -40,9 +48,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -52,7 +57,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <p>
             Druid uses rules to determine what data should be retained in the cluster. The rules are evaluated in order from top to bottom. For more information please refer to the
@@ -67,10 +72,10 @@ exports[`RetentionDialog matches snapshot 1`] = `
             .
           </p>
           <div
-            class="bp3-form-group"
+            class="bp4-form-group"
           >
             <div
-              class="bp3-form-content"
+              class="bp4-form-content"
             >
               <div
                 class="rule-editor"
@@ -79,16 +84,17 @@ exports[`RetentionDialog matches snapshot 1`] = `
                   class="title"
                 >
                   <button
-                    class="bp3-button bp3-minimal left"
+                    class="bp4-button bp4-minimal left"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       loadByPeriod(P1000Y+future)
                     </span>
                     <span
-                      class="bp3-icon bp3-icon-caret-down"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-caret-down"
                       icon="caret-down"
                     >
                       <svg
@@ -97,9 +103,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          caret-down
-                        </desc>
                         <path
                           d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                           fill-rule="evenodd"
@@ -111,12 +114,14 @@ exports[`RetentionDialog matches snapshot 1`] = `
                     class="spacer"
                   />
                   <button
-                    class="bp3-button bp3-minimal"
+                    class="bp4-button bp4-minimal"
                     type="button"
                   >
                     <span
-                      class="bp3-icon bp3-icon-trash"
+                      aria-hidden="true"
+                      class="bp4-icon bp4-icon-trash"
                       icon="trash"
+                      tabindex="0"
                     >
                       <svg
                         data-icon="trash"
@@ -124,9 +129,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         viewBox="0 0 16 16"
                         width="16"
                       >
-                        <desc>
-                          trash
-                        </desc>
                         <path
                           d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
                           fill-rule="evenodd"
@@ -136,28 +138,28 @@ exports[`RetentionDialog matches snapshot 1`] = `
                   </button>
                 </div>
                 <div
-                  class="bp3-collapse"
+                  class="bp4-collapse"
                   style="height: auto; overflow-y: visible; transition: none;"
                 >
                   <div
                     aria-hidden="false"
-                    class="bp3-collapse-body"
+                    class="bp4-collapse-body"
                     style="transform: translateY(0); transition: none;"
                   >
                     <div
-                      class="bp3-card bp3-elevation-2"
+                      class="bp4-card bp4-elevation-2"
                     >
                       <div
-                        class="bp3-form-group"
+                        class="bp4-form-group"
                       >
                         <div
-                          class="bp3-form-content"
+                          class="bp4-form-content"
                         >
                           <div
-                            class="bp3-control-group"
+                            class="bp4-control-group"
                           >
                             <div
-                              class="bp3-html-select"
+                              class="bp4-html-select"
                             >
                               <select>
                                 <option
@@ -212,7 +214,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                 </option>
                               </select>
                               <span
-                                class="bp3-icon bp3-icon-double-caret-vertical"
+                                class="bp4-icon bp4-icon-double-caret-vertical"
                                 icon="double-caret-vertical"
                               >
                                 <svg
@@ -222,7 +224,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                   width="16"
                                 >
                                   <desc>
-                                    double-caret-vertical
+                                    Open dropdown
                                   </desc>
                                   <path
                                     d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -235,28 +237,31 @@ exports[`RetentionDialog matches snapshot 1`] = `
                               class="formatted-input suggestible-input"
                             >
                               <div
-                                class="bp3-input-group"
+                                class="bp4-input-group"
                               >
                                 <input
-                                  class="bp3-input"
+                                  class="bp4-input"
                                   placeholder="P1D"
                                   style="padding-right: 0px;"
                                   type="text"
                                   value="P1000Y"
                                 />
                                 <span
-                                  class="bp3-input-action"
+                                  class="bp4-input-action"
                                 >
                                   <span
-                                    class="bp3-popover2-target"
+                                    aria-haspopup="true"
+                                    class="bp4-popover2-target"
                                   >
                                     <button
-                                      class="bp3-button bp3-minimal"
+                                      class="bp4-button bp4-minimal"
                                       type="button"
                                     >
                                       <span
-                                        class="bp3-icon bp3-icon-caret-down"
+                                        aria-hidden="true"
+                                        class="bp4-icon bp4-icon-caret-down"
                                         icon="caret-down"
+                                        tabindex="0"
                                       >
                                         <svg
                                           data-icon="caret-down"
@@ -264,9 +269,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                           viewBox="0 0 16 16"
                                           width="16"
                                         >
-                                          <desc>
-                                            caret-down
-                                          </desc>
                                           <path
                                             d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                                             fill-rule="evenodd"
@@ -279,14 +281,14 @@ exports[`RetentionDialog matches snapshot 1`] = `
                               </div>
                             </div>
                             <label
-                              class="bp3-control bp3-switch include-future"
+                              class="bp4-control bp4-switch include-future"
                             >
                               <input
                                 checked=""
                                 type="checkbox"
                               />
                               <span
-                                class="bp3-control-indicator"
+                                class="bp4-control-indicator"
                               />
                               Include future
                             </label>
@@ -294,34 +296,34 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         </div>
                       </div>
                       <div
-                        class="bp3-form-group"
+                        class="bp4-form-group"
                       >
                         <div
-                          class="bp3-form-content"
+                          class="bp4-form-content"
                         >
                           <div
-                            class="bp3-control-group"
+                            class="bp4-control-group"
                           >
                             <button
-                              class="bp3-button bp3-minimal"
+                              class="bp4-button bp4-minimal"
                               style="pointer-events: none;"
                               type="button"
                             >
                               <span
-                                class="bp3-button-text"
+                                class="bp4-button-text"
                               >
                                 Replicants:
                               </span>
                             </button>
                             <div
-                              class="bp3-control-group bp3-numeric-input"
+                              class="bp4-control-group bp4-numeric-input"
                             >
                               <div
-                                class="bp3-input-group"
+                                class="bp4-input-group"
                               >
                                 <input
                                   autocomplete="off"
-                                  class="bp3-input"
+                                  class="bp4-input"
                                   max="256"
                                   min="1"
                                   type="text"
@@ -329,15 +331,18 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                 />
                               </div>
                               <div
-                                class="bp3-button-group bp3-vertical bp3-fixed"
+                                class="bp4-button-group bp4-vertical bp4-fixed"
                               >
                                 <button
-                                  class="bp3-button"
+                                  aria-label="increment"
+                                  class="bp4-button"
                                   type="button"
                                 >
                                   <span
-                                    class="bp3-icon bp3-icon-chevron-up"
+                                    aria-hidden="true"
+                                    class="bp4-icon bp4-icon-chevron-up"
                                     icon="chevron-up"
+                                    tabindex="0"
                                   >
                                     <svg
                                       data-icon="chevron-up"
@@ -345,9 +350,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                       viewBox="0 0 16 16"
                                       width="16"
                                     >
-                                      <desc>
-                                        chevron-up
-                                      </desc>
                                       <path
                                         d="M12.71 9.29l-4-4C8.53 5.11 8.28 5 8 5s-.53.11-.71.29l-4 4a1.003 1.003 0 001.42 1.42L8 7.41l3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71z"
                                         fill-rule="evenodd"
@@ -356,12 +358,15 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                   </span>
                                 </button>
                                 <button
-                                  class="bp3-button"
+                                  aria-label="decrement"
+                                  class="bp4-button"
                                   type="button"
                                 >
                                   <span
-                                    class="bp3-icon bp3-icon-chevron-down"
+                                    aria-hidden="true"
+                                    class="bp4-icon bp4-icon-chevron-down"
                                     icon="chevron-down"
+                                    tabindex="0"
                                   >
                                     <svg
                                       data-icon="chevron-down"
@@ -369,9 +374,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                       viewBox="0 0 16 16"
                                       width="16"
                                     >
-                                      <desc>
-                                        chevron-down
-                                      </desc>
                                       <path
                                         d="M12 5c-.28 0-.53.11-.71.29L8 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42l4 4c.18.18.43.29.71.29s.53-.11.71-.29l4-4A1.003 1.003 0 0012 5z"
                                         fill-rule="evenodd"
@@ -382,18 +384,18 @@ exports[`RetentionDialog matches snapshot 1`] = `
                               </div>
                             </div>
                             <button
-                              class="bp3-button bp3-minimal"
+                              class="bp4-button bp4-minimal"
                               style="pointer-events: none;"
                               type="button"
                             >
                               <span
-                                class="bp3-button-text"
+                                class="bp4-button-text"
                               >
                                 Tier:
                               </span>
                             </button>
                             <div
-                              class="bp3-html-select bp3-fill"
+                              class="bp4-html-select bp4-fill"
                             >
                               <select>
                                 <option
@@ -413,7 +415,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                 </option>
                               </select>
                               <span
-                                class="bp3-icon bp3-icon-double-caret-vertical"
+                                class="bp4-icon bp4-icon-double-caret-vertical"
                                 icon="double-caret-vertical"
                               >
                                 <svg
@@ -423,7 +425,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                   width="16"
                                 >
                                   <desc>
-                                    double-caret-vertical
+                                    Open dropdown
                                   </desc>
                                   <path
                                     d="M5 7h6a1.003 1.003 0 00.71-1.71l-3-3C8.53 2.11 8.28 2 8 2s-.53.11-.71.29l-3 3A1.003 1.003 0 005 7zm6 2H5a1.003 1.003 0 00-.71 1.71l3 3c.18.18.43.29.71.29s.53-.11.71-.29l3-3A1.003 1.003 0 0011 9z"
@@ -433,14 +435,16 @@ exports[`RetentionDialog matches snapshot 1`] = `
                               </span>
                             </div>
                             <button
-                              class="bp3-button bp3-disabled"
+                              class="bp4-button bp4-disabled"
                               disabled=""
                               tabindex="-1"
                               type="button"
                             >
                               <span
-                                class="bp3-icon bp3-icon-trash"
+                                aria-hidden="true"
+                                class="bp4-icon bp4-icon-trash"
                                 icon="trash"
+                                tabindex="0"
                               >
                                 <svg
                                   data-icon="trash"
@@ -448,9 +452,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                   viewBox="0 0 16 16"
                                   width="16"
                                 >
-                                  <desc>
-                                    trash
-                                  </desc>
                                   <path
                                     d="M14.49 3.99h-13c-.28 0-.5.22-.5.5s.22.5.5.5h.5v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-10h.5c.28 0 .5-.22.5-.5s-.22-.5-.5-.5zm-8.5 9c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm3 0c0 .55-.45 1-1 1s-1-.45-1-1v-6c0-.55.45-1 1-1s1 .45 1 1v6zm2-12h-4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1h-4c-.55 0-1 .45-1 1v1h14v-1c0-.55-.45-1-1-1z"
                                     fill-rule="evenodd"
@@ -460,18 +461,20 @@ exports[`RetentionDialog matches snapshot 1`] = `
                             </button>
                           </div>
                           <div
-                            class="bp3-form-group right"
+                            class="bp4-form-group right"
                           >
                             <div
-                              class="bp3-form-content"
+                              class="bp4-form-content"
                             >
                               <button
-                                class="bp3-button bp3-minimal"
+                                class="bp4-button bp4-minimal"
                                 type="button"
                               >
                                 <span
-                                  class="bp3-icon bp3-icon-plus"
+                                  aria-hidden="true"
+                                  class="bp4-icon bp4-icon-plus"
                                   icon="plus"
+                                  tabindex="-1"
                                 >
                                   <svg
                                     data-icon="plus"
@@ -479,9 +482,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                     viewBox="0 0 16 16"
                                     width="16"
                                   >
-                                    <desc>
-                                      plus
-                                    </desc>
                                     <path
                                       d="M13 7H9V3c0-.55-.45-1-1-1s-1 .45-1 1v4H3c-.55 0-1 .45-1 1s.45 1 1 1h4v4c0 .55.45 1 1 1s1-.45 1-1V9h4c.55 0 1-.45 1-1s-.45-1-1-1z"
                                       fill-rule="evenodd"
@@ -489,7 +489,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                                   </svg>
                                 </span>
                                 <span
-                                  class="bp3-button-text"
+                                  class="bp4-button-text"
                                 >
                                   Add a tier
                                 </span>
@@ -504,12 +504,14 @@ exports[`RetentionDialog matches snapshot 1`] = `
               </div>
               <div>
                 <button
-                  class="bp3-button"
+                  class="bp4-button"
                   type="button"
                 >
                   <span
-                    class="bp3-icon bp3-icon-plus"
+                    aria-hidden="true"
+                    class="bp4-icon bp4-icon-plus"
                     icon="plus"
+                    tabindex="-1"
                   >
                     <svg
                       data-icon="plus"
@@ -517,9 +519,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                     >
-                      <desc>
-                        plus
-                      </desc>
                       <path
                         d="M13 7H9V3c0-.55-.45-1-1-1s-1 .45-1 1v4H3c-.55 0-1 .45-1 1s.45 1 1 1h4v4c0 .55.45 1 1 1s1-.45 1-1V9h4c.55 0 1-.45 1-1s-.45-1-1-1z"
                         fill-rule="evenodd"
@@ -527,7 +526,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                     </svg>
                   </span>
                   <span
-                    class="bp3-button-text"
+                    class="bp4-button-text"
                   >
                     New rule
                   </span>
@@ -536,13 +535,13 @@ exports[`RetentionDialog matches snapshot 1`] = `
             </div>
           </div>
           <div
-            class="bp3-divider"
+            class="bp4-divider"
           />
           <div
-            class="bp3-form-group"
+            class="bp4-form-group"
           >
             <div
-              class="bp3-form-content"
+              class="bp4-form-content"
             >
               <p>
                 Cluster defaults (
@@ -555,13 +554,13 @@ exports[`RetentionDialog matches snapshot 1`] = `
                 class="default-rule"
               >
                 <button
-                  class="bp3-button bp3-disabled"
+                  class="bp4-button bp4-disabled"
                   disabled=""
                   tabindex="-1"
                   type="button"
                 >
                   <span
-                    class="bp3-button-text"
+                    class="bp4-button-text"
                   >
                     loadForever
                   </span>
@@ -571,42 +570,43 @@ exports[`RetentionDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-minimal left-align-button"
+              class="bp4-button bp4-minimal left-align-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 History
               </span>
             </button>
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Reset
               </span>
             </button>
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Next
               </span>
               <span
-                class="bp3-icon bp3-icon-arrow-right"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-arrow-right"
                 icon="arrow-right"
               >
                 <svg
@@ -615,9 +615,6 @@ exports[`RetentionDialog matches snapshot 1`] = `
                   viewBox="0 0 16 16"
                   width="16"
                 >
-                  <desc>
-                    arrow-right
-                  </desc>
                   <path
                     d="M14.7 7.29l-5-5a.965.965 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l3.29 3.29H1.99c-.55 0-1 .45-1 1s.45 1 1 1h9.59l-3.29 3.29a1.003 1.003 0 001.42 1.42l5-5c.18-.18.29-.43.29-.71s-.12-.52-.3-.7z"
                     fill-rule="evenodd"
@@ -629,6 +626,10 @@ exports[`RetentionDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/retention-dialog/retention-dialog.scss b/web-console/src/dialogs/retention-dialog/retention-dialog.scss
index c4d33ec355..7fa00021ad 100644
--- a/web-console/src/dialogs/retention-dialog/retention-dialog.scss
+++ b/web-console/src/dialogs/retention-dialog/retention-dialog.scss
@@ -16,13 +16,15 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .retention-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     top: 5%;
     width: 750px;
   }
 
-  .bp3-dialog-body {
+  .#{$bp-ns}-dialog-body {
     .rule-editor {
       margin-bottom: 15px;
     }
diff --git a/web-console/src/dialogs/segments-table-action-dialog/__snapshots__/segment-table-action-dialog.spec.tsx.snap b/web-console/src/dialogs/segments-table-action-dialog/__snapshots__/segment-table-action-dialog.spec.tsx.snap
index d6109e87b6..f7cd0ea484 100644
--- a/web-console/src/dialogs/segments-table-action-dialog/__snapshots__/segment-table-action-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/segments-table-action-dialog/__snapshots__/segment-table-action-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`SegmentTableActionDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog table-action-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog table-action-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Segment: test
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,17 +57,18 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="side-bar"
           >
             <button
-              class="bp3-button bp3-intent-primary tab-button"
+              class="bp4-button bp4-intent-primary tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-manually-entered-data"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-manually-entered-data"
                 icon="manually-entered-data"
               >
                 <svg
@@ -72,9 +77,6 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    manually-entered-data
-                  </desc>
                   <path
                     d="M1 12h4.34l2-2H1c-.55 0-1 .45-1 1s.45 1 1 1zm16.77-3.94l1.65-1.65c.36-.36.58-.86.58-1.41 0-1.1-.9-2-2-2-.55 0-1.05.22-1.41.59l-1.65 1.65 2.83 2.82zM1 4h12.34l2-2H1c-.55 0-1 .45-1 1s.45 1 1 1zM0 15c0 .55.45 1 1 1h.34l2-2H1c-.55 0-1 .45-1 1zm1-7h8.34l2-2H1c-.55 0-1 .45-1 1s.45 1 1 1zm18 2h-.34l-2 2H19c.55 0 1-.45 1-1s-.45-1-1-1zm0 4h-4.34l-2 2H19c.55 0 1-.45 1-1s-.45-1-1-1zM4 19l4.41-1.59-2.81-2.79L4 19zM14.23 5.94l-7.65 7.65 2.83 2.83 7.65-7.65-2.83-2.83z"
                     fill-rule="evenodd"
@@ -82,7 +84,7 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Metadata
               </span>
@@ -98,40 +100,40 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
                 class="top-actions"
               >
                 <div
-                  class="bp3-button-group right-buttons"
+                  class="bp4-button-group right-buttons"
                 >
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       Save
                     </span>
                   </button>
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       Copy
                     </span>
                   </button>
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       View raw
                     </span>
@@ -179,21 +181,24 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
             class="footer-actions-left"
           >
             <span
-              class="bp3-popover2-target"
+              aria-haspopup="true"
+              class="bp4-popover2-target"
             >
               <button
-                class="bp3-button"
+                class="bp4-button"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-wrench"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-wrench"
                   icon="wrench"
+                  tabindex="-1"
                 >
                   <svg
                     data-icon="wrench"
@@ -201,9 +206,6 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      wrench
-                    </desc>
                     <path
                       d="M15.83 3.7l-3.06 3.05-2.84-.7-.7-2.83L12.29.17a5.004 5.004 0 00-4.83 1.29 4.967 4.967 0 00-1.12 5.36L.58 12.58c-.36.36-.58.86-.58 1.41 0 1.1.9 2 2 2 .55 0 1.05-.22 1.41-.59l5.77-5.77c1.79.69 3.91.33 5.35-1.12 1.32-1.3 1.74-3.15 1.3-4.81z"
                       fill-rule="evenodd"
@@ -211,12 +213,13 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
                   </svg>
                 </span>
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Actions
                 </span>
                 <span
-                  class="bp3-icon bp3-icon-caret-down"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-caret-down"
                   icon="caret-down"
                 >
                   <svg
@@ -225,9 +228,6 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      caret-down
-                    </desc>
                     <path
                       d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                       fill-rule="evenodd"
@@ -238,14 +238,14 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
             </span>
           </div>
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -254,6 +254,10 @@ exports[`SegmentTableActionDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/show-value-dialog/__snapshots__/show-value-dialog.spec.tsx.snap b/web-console/src/dialogs/show-value-dialog/__snapshots__/show-value-dialog.spec.tsx.snap
index 267b90cdf1..d67aa9b6f5 100644
--- a/web-console/src/dialogs/show-value-dialog/__snapshots__/show-value-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/show-value-dialog/__snapshots__/show-value-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`ShowValueDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog show-value-dialog normal"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog show-value-dialog normal"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Full value
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`ShowValueDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,21 +57,23 @@ exports[`ShowValueDialog matches snapshot 1`] = `
           </button>
         </div>
         <textarea
-          class="bp3-input"
+          class="bp4-input"
           spellcheck="false"
         >
           Bot: Automatska zamjena teksta  (-[[Administrativna podjela Meksika|Admin]] +[[Administrativna podjela Meksika|Admi]])
         </textarea>
         <div
-          class="bp3-dialog-footer-actions"
+          class="bp4-dialog-footer-actions"
         >
           <button
-            class="bp3-button"
+            class="bp4-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-duplicate"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-duplicate"
               icon="duplicate"
+              tabindex="-1"
             >
               <svg
                 data-icon="duplicate"
@@ -75,9 +81,6 @@ exports[`ShowValueDialog matches snapshot 1`] = `
                 viewBox="0 0 16 16"
                 width="16"
               >
-                <desc>
-                  duplicate
-                </desc>
                 <path
                   d="M15 0H5c-.55 0-1 .45-1 1v2h2V2h8v7h-1v2h2c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1zm-4 4H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zm-1 10H2V6h8v8z"
                   fill-rule="evenodd"
@@ -85,17 +88,17 @@ exports[`ShowValueDialog matches snapshot 1`] = `
               </svg>
             </span>
             <span
-              class="bp3-button-text"
+              class="bp4-button-text"
             >
               Copy
             </span>
           </button>
           <button
-            class="bp3-button bp3-intent-primary"
+            class="bp4-button bp4-intent-primary"
             type="button"
           >
             <span
-              class="bp3-button-text"
+              class="bp4-button-text"
             >
               Close
             </span>
@@ -103,6 +106,10 @@ exports[`ShowValueDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss b/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss
index 5cce81bc92..a1da01e593 100644
--- a/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss
+++ b/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss
@@ -16,26 +16,28 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .show-value-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     padding-bottom: 10px;
   }
 
-  &.normal.bp3-dialog {
+  &.normal.#{$bp-ns}-dialog {
     height: 600px;
   }
 
-  &.large.bp3-dialog {
+  &.large.#{$bp-ns}-dialog {
     width: 90vw;
     height: 90vh;
   }
 
-  .bp3-input {
+  .#{$bp-ns}-input {
     margin: 10px;
     flex: 1;
   }
 
-  .bp3-dialog-footer-actions {
+  .#{$bp-ns}-dialog-footer-actions {
     padding-right: 10px;
   }
 }
diff --git a/web-console/src/dialogs/snitch-dialog/__snapshots__/snitch-dialog.spec.tsx.snap b/web-console/src/dialogs/snitch-dialog/__snapshots__/snitch-dialog.spec.tsx.snap
index 98a963f865..0410348c72 100644
--- a/web-console/src/dialogs/snitch-dialog/__snapshots__/snitch-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/snitch-dialog/__snapshots__/snitch-dialog.spec.tsx.snap
@@ -2,36 +2,44 @@
 
 exports[`SnitchDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog snitch-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog snitch-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Be snitchin
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -40,9 +48,6 @@ exports[`SnitchDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -52,25 +57,26 @@ exports[`SnitchDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         />
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Next
               </span>
               <span
-                class="bp3-icon bp3-icon-arrow-right"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-arrow-right"
                 icon="arrow-right"
               >
                 <svg
@@ -79,9 +85,6 @@ exports[`SnitchDialog matches snapshot 1`] = `
                   viewBox="0 0 16 16"
                   width="16"
                 >
-                  <desc>
-                    arrow-right
-                  </desc>
                   <path
                     d="M14.7 7.29l-5-5a.965.965 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l3.29 3.29H1.99c-.55 0-1 .45-1 1s.45 1 1 1h9.59l-3.29 3.29a1.003 1.003 0 001.42 1.42l5-5c.18-.18.29-.43.29-.71s-.12-.52-.3-.7z"
                     fill-rule="evenodd"
@@ -93,42 +96,54 @@ exports[`SnitchDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
 
 exports[`SnitchDialog matches snapshot with history 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog snitch-dialog"
+        aria-labelledby="title-bp-dialog-1"
+        class="bp4-dialog snitch-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-1"
           >
             Be snitchin
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -137,9 +152,6 @@ exports[`SnitchDialog matches snapshot with history 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -149,35 +161,36 @@ exports[`SnitchDialog matches snapshot with history 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         />
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-minimal left-align-button"
+              class="bp4-button bp4-minimal left-align-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 History
               </span>
             </button>
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Next
               </span>
               <span
-                class="bp3-icon bp3-icon-arrow-right"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-arrow-right"
                 icon="arrow-right"
               >
                 <svg
@@ -186,9 +199,6 @@ exports[`SnitchDialog matches snapshot with history 1`] = `
                   viewBox="0 0 16 16"
                   width="16"
                 >
-                  <desc>
-                    arrow-right
-                  </desc>
                   <path
                     d="M14.7 7.29l-5-5a.965.965 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l3.29 3.29H1.99c-.55 0-1 .45-1 1s.45 1 1 1h9.59l-3.29 3.29a1.003 1.003 0 001.42 1.42l5-5c.18-.18.29-.43.29-.71s-.12-.52-.3-.7z"
                     fill-rule="evenodd"
@@ -200,6 +210,10 @@ exports[`SnitchDialog matches snapshot with history 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss b/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss
index 9d80b58e13..c77b3f53d6 100644
--- a/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss
+++ b/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .snitch-dialog {
-  .bp3-dialog-footer-actions {
+  .#{$bp-ns}-dialog-footer-actions {
     position: relative;
 
     .left-align-button {
diff --git a/web-console/src/dialogs/spec-dialog/__snapshots__/spec-dialog.spec.tsx.snap b/web-console/src/dialogs/spec-dialog/__snapshots__/spec-dialog.spec.tsx.snap
index 6e75c6a006..afdc34d10f 100644
--- a/web-console/src/dialogs/spec-dialog/__snapshots__/spec-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/spec-dialog/__snapshots__/spec-dialog.spec.tsx.snap
@@ -2,36 +2,44 @@
 
 exports[`SpecDialog matches snapshot no initSpec 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog spec-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog spec-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             test
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -40,9 +48,6 @@ exports[`SpecDialog matches snapshot no initSpec 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -149,29 +154,29 @@ exports[`SpecDialog matches snapshot no initSpec 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
             </button>
             <button
-              class="bp3-button bp3-disabled bp3-intent-primary"
+              class="bp4-button bp4-disabled bp4-intent-primary"
               disabled=""
               tabindex="-1"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Submit
               </span>
@@ -180,42 +185,54 @@ exports[`SpecDialog matches snapshot no initSpec 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
 
 exports[`SpecDialog matches snapshot with initSpec 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog spec-dialog"
+        aria-labelledby="title-bp-dialog-1"
+        class="bp4-dialog spec-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-1"
           >
             test
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -224,9 +241,6 @@ exports[`SpecDialog matches snapshot with initSpec 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -327,27 +341,27 @@ exports[`SpecDialog matches snapshot with initSpec 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button"
+              class="bp4-button"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
             </button>
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Submit
               </span>
@@ -356,6 +370,10 @@ exports[`SpecDialog matches snapshot with initSpec 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/spec-dialog/spec-dialog.scss b/web-console/src/dialogs/spec-dialog/spec-dialog.scss
index d9af9ae850..7bf3869941 100644
--- a/web-console/src/dialogs/spec-dialog/spec-dialog.scss
+++ b/web-console/src/dialogs/spec-dialog/spec-dialog.scss
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .spec-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     top: 5%;
     width: 90%;
   }
diff --git a/web-console/src/dialogs/status-dialog/__snapshots__/status-dialog.spec.tsx.snap b/web-console/src/dialogs/status-dialog/__snapshots__/status-dialog.spec.tsx.snap
index a5f25c70f1..13c99cfdbc 100644
--- a/web-console/src/dialogs/status-dialog/__snapshots__/status-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/status-dialog/__snapshots__/status-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`StatusDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog status-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog status-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Status
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`StatusDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,7 +57,7 @@ exports[`StatusDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="loader"
@@ -90,17 +94,17 @@ exports[`StatusDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
             class="view-raw-button"
           >
             <button
-              class="bp3-button bp3-minimal"
+              class="bp4-button bp4-minimal"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 View raw
               </span>
@@ -110,11 +114,11 @@ exports[`StatusDialog matches snapshot 1`] = `
             class="close-button"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -123,6 +127,10 @@ exports[`StatusDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/status-dialog/status-dialog.scss b/web-console/src/dialogs/status-dialog/status-dialog.scss
index fbda2691d3..e259747ccf 100644
--- a/web-console/src/dialogs/status-dialog/status-dialog.scss
+++ b/web-console/src/dialogs/status-dialog/status-dialog.scss
@@ -15,6 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+@import '../../variables';
+
 $side-bar-width: 120px;
 
 .status-dialog {
@@ -23,13 +26,13 @@ $side-bar-width: 120px;
     height: 500px;
   }
 
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     margin-top: 5vh;
     top: 5%;
     width: 60vw;
     height: 90vh;
 
-    .bp3-dialog-body {
+    .#{$bp-ns}-dialog-body {
       position: relative;
 
       .main-container {
@@ -50,7 +53,7 @@ $side-bar-width: 120px;
       }
     }
 
-    .bp3-dialog-footer {
+    .#{$bp-ns}-dialog-footer {
       position: relative;
       display: inline;
       overflow: auto;
diff --git a/web-console/src/dialogs/supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap b/web-console/src/dialogs/supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap
index 5533e7d2a8..68d35ec56c 100755
--- a/web-console/src/dialogs/supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`SupervisorTableActionDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog table-action-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog table-action-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Supervisor: test
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,17 +57,18 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="side-bar"
           >
             <button
-              class="bp3-button bp3-intent-primary tab-button"
+              class="bp4-button bp4-intent-primary tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-dashboard"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-dashboard"
                 icon="dashboard"
               >
                 <svg
@@ -72,9 +77,6 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    dashboard
-                  </desc>
                   <path
                     d="M6 5c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zM4 9c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zm6-4c.55 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1zm0-5C4.48 0 0 4.48 0 10s4.48 10 10 10 10-4.48 10-10S15.52 0 10 0zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm6-9c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zm-8 5c0 1.1.9 2 2 2s2-.9 2-2c0-.33-2-8-2-8s-2 7.67-2 8zm6-9c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1z"
                     fill-rule="evenodd"
@@ -82,17 +84,18 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Status
               </span>
             </button>
             <button
-              class="bp3-button bp3-minimal tab-button"
+              class="bp4-button bp4-minimal tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-chart"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-chart"
                 icon="chart"
               >
                 <svg
@@ -101,9 +104,6 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    chart
-                  </desc>
                   <path
                     d="M7 11v8c0 .55.45 1 1 1h4c.55 0 1-.45 1-1v-8l-2 2-4-2zm-7 8c0 .55.45 1 1 1h4c.55 0 1-.45 1-1v-8l-6 3v5zM17 7l-3 3v9c0 .55.45 1 1 1h4c.55 0 1-.45 1-1V8.74c-.26.15-.58.26-1 .26-1.92 0-2-2-2-2zm2-6h-4c-.55 0-1 .45-1 1s.45 1 1 1h1.59L10.8 8.78 7.45 7.11v.01C7.31 7.05 7.16 7 7 7s-.31.05-.44.11V7.1l-6 3v.01c-.33.17-.56.5-.56.89 0 .55.45 1 1 1 .16 0 .31-.05.44-.11v.01L7 9.12l3.55 1.78v-.01c.14.06.29.11.45.11.28 0 .53-.11.71-.29L18 4.41V6c0 .55.45 1 1 1s1-.45 1-1V2c0-.55-.4 [...]
                     fill-rule="evenodd"
@@ -111,17 +111,18 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Statistics
               </span>
             </button>
             <button
-              class="bp3-button bp3-minimal tab-button"
+              class="bp4-button bp4-minimal tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-align-left"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-align-left"
                 icon="align-left"
               >
                 <svg
@@ -130,9 +131,6 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    align-left
-                  </desc>
                   <path
                     d="M1 7h10c.55 0 1-.45 1-1s-.45-1-1-1H1c-.55 0-1 .45-1 1s.45 1 1 1zm0-4h18c.55 0 1-.45 1-1s-.45-1-1-1H1c-.55 0-1 .45-1 1s.45 1 1 1zm14 14H1c-.55 0-1 .45-1 1s.45 1 1 1h14c.55 0 1-.45 1-1s-.45-1-1-1zm4-8H1c-.55 0-1 .45-1 1s.45 1 1 1h18c.55 0 1-.45 1-1s-.45-1-1-1zM1 15h6c.55 0 1-.45 1-1s-.45-1-1-1H1c-.55 0-1 .45-1 1s.45 1 1 1z"
                     fill-rule="evenodd"
@@ -140,17 +138,18 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Payload
               </span>
             </button>
             <button
-              class="bp3-button bp3-minimal tab-button"
+              class="bp4-button bp4-minimal tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-history"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-history"
                 icon="history"
               >
                 <svg
@@ -159,9 +158,6 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    history
-                  </desc>
                   <path
                     d="M10 0C6.71 0 3.82 1.6 2 4.05V2c0-.55-.45-1-1-1s-1 .45-1 1v4c0 .55.45 1 1 1h4c.55 0 1-.45 1-1s-.45-1-1-1H3.76C5.23 3.17 7.47 2 10 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8c0-.55-.45-1-1-1s-1 .45-1 1c0 5.52 4.48 10 10 10s10-4.48 10-10S15.52 0 10 0zm0 3c-.55 0-1 .45-1 1v6c0 .28.11.53.29.71l3 3a1.003 1.003 0 001.42-1.42L11 9.59V4c0-.55-.45-1-1-1z"
                     fill-rule="evenodd"
@@ -169,7 +165,7 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 History
               </span>
@@ -185,40 +181,40 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                 class="top-actions"
               >
                 <div
-                  class="bp3-button-group right-buttons"
+                  class="bp4-button-group right-buttons"
                 >
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       Save
                     </span>
                   </button>
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       Copy
                     </span>
                   </button>
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       View raw
                     </span>
@@ -266,21 +262,24 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
             class="footer-actions-left"
           >
             <span
-              class="bp3-popover2-target"
+              aria-haspopup="true"
+              class="bp4-popover2-target"
             >
               <button
-                class="bp3-button"
+                class="bp4-button"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-wrench"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-wrench"
                   icon="wrench"
+                  tabindex="-1"
                 >
                   <svg
                     data-icon="wrench"
@@ -288,9 +287,6 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      wrench
-                    </desc>
                     <path
                       d="M15.83 3.7l-3.06 3.05-2.84-.7-.7-2.83L12.29.17a5.004 5.004 0 00-4.83 1.29 4.967 4.967 0 00-1.12 5.36L.58 12.58c-.36.36-.58.86-.58 1.41 0 1.1.9 2 2 2 .55 0 1.05-.22 1.41-.59l5.77-5.77c1.79.69 3.91.33 5.35-1.12 1.32-1.3 1.74-3.15 1.3-4.81z"
                       fill-rule="evenodd"
@@ -298,12 +294,13 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                   </svg>
                 </span>
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Actions
                 </span>
                 <span
-                  class="bp3-icon bp3-icon-caret-down"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-caret-down"
                   icon="caret-down"
                 >
                   <svg
@@ -312,9 +309,6 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      caret-down
-                    </desc>
                     <path
                       d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                       fill-rule="evenodd"
@@ -325,14 +319,14 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
             </span>
           </div>
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -341,6 +335,10 @@ exports[`SupervisorTableActionDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/table-action-dialog/__snapshots__/table-action-dialog.spec.tsx.snap b/web-console/src/dialogs/table-action-dialog/__snapshots__/table-action-dialog.spec.tsx.snap
index 44bd947ab5..203f897426 100644
--- a/web-console/src/dialogs/table-action-dialog/__snapshots__/table-action-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/table-action-dialog/__snapshots__/table-action-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`TableActionDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog table-action-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog table-action-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Table dummy actions
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`TableActionDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,17 +57,18 @@ exports[`TableActionDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="side-bar"
           >
             <button
-              class="bp3-button bp3-minimal tab-button"
+              class="bp4-button bp4-minimal tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-badge"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-badge"
                 icon="badge"
               >
                 <svg
@@ -72,9 +77,6 @@ exports[`TableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    badge
-                  </desc>
                   <path
                     d="M16.94 5.73c-.19-1.41.62-2.52 1.38-3.59L17.03.65C14.89 1.76 11.88 1.48 10 0 8.12 1.48 5.11 1.76 2.97.65L1.68 2.14c.76 1.07 1.57 2.18 1.38 3.59C2.68 8.59 0 10.94 1.4 14.08c.56 1.43 1.81 2.37 3.4 2.75 1.95.46 4.4.91 5.2 3.17.8-2.26 3.25-2.71 5.2-3.17 1.6-.38 2.84-1.32 3.4-2.75 1.4-3.14-1.28-5.49-1.66-8.35z"
                     fill-rule="evenodd"
@@ -82,7 +84,7 @@ exports[`TableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 test
               </span>
@@ -93,17 +95,17 @@ exports[`TableActionDialog matches snapshot 1`] = `
           />
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -112,6 +114,10 @@ exports[`TableActionDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss b/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss
index 4af0a8848e..3f73207685 100644
--- a/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss
+++ b/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss
@@ -16,10 +16,12 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 $side-bar-width: 120px;
 
 .table-action-dialog {
-  &.bp3-dialog {
+  &.#{$bp-ns}-dialog {
     position: relative;
     width: 90vw;
     height: 85vh;
@@ -36,7 +38,7 @@ $side-bar-width: 120px;
     }
   }
 
-  .bp3-dialog-body {
+  .#{$bp-ns}-dialog-body {
     position: relative;
     margin: 0;
 
@@ -59,11 +61,11 @@ $side-bar-width: 120px;
           background-color: #2c74a8;
         }
 
-        .bp3-icon {
+        .#{$bp-ns}-icon {
           margin-right: 0;
         }
 
-        .bp3-button-text {
+        .#{$bp-ns}-button-text {
           margin-top: 5px;
         }
       }
@@ -79,7 +81,7 @@ $side-bar-width: 120px;
     }
   }
 
-  .bp3-dialog-footer {
+  .#{$bp-ns}-dialog-footer {
     position: relative;
 
     .footer-actions-left {
diff --git a/web-console/src/dialogs/task-table-action-dialog/__snapshots__/task-table-action-dialog.spec.tsx.snap b/web-console/src/dialogs/task-table-action-dialog/__snapshots__/task-table-action-dialog.spec.tsx.snap
index c4a1f72aee..2c5c2117ee 100644
--- a/web-console/src/dialogs/task-table-action-dialog/__snapshots__/task-table-action-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/task-table-action-dialog/__snapshots__/task-table-action-dialog.spec.tsx.snap
@@ -2,37 +2,44 @@
 
 exports[`TaskTableActionDialog matches snapshot 1`] = `
 <div
-  class="bp3-portal"
+  class="bp4-portal"
 >
   <div
-    class="bp3-overlay bp3-overlay-open bp3-overlay-scroll-container"
+    aria-live="polite"
+    class="bp4-overlay bp4-overlay-open bp4-overlay-scroll-container"
   >
     <div
-      class="bp3-overlay-backdrop bp3-overlay-appear bp3-overlay-appear-active"
+      class="bp4-overlay-start-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
       tabindex="0"
     />
     <div
-      class="bp3-dialog-container bp3-overlay-content bp3-overlay-appear bp3-overlay-appear-active"
-      tabindex="0"
+      class="bp4-overlay-backdrop bp4-overlay-appear bp4-overlay-appear-active"
+    />
+    <div
+      class="bp4-dialog-container bp4-overlay-content bp4-overlay-appear bp4-overlay-appear-active"
     >
       <div
-        class="bp3-dialog table-action-dialog"
+        aria-labelledby="title-bp-dialog-0"
+        class="bp4-dialog table-action-dialog"
+        role="dialog"
       >
         <div
-          class="bp3-dialog-header"
+          class="bp4-dialog-header"
         >
           <h4
-            class="bp3-heading"
+            class="bp4-heading"
+            id="title-bp-dialog-0"
           >
             Task: test
           </h4>
           <button
             aria-label="Close"
-            class="bp3-button bp3-minimal bp3-dialog-close-button"
+            class="bp4-button bp4-minimal bp4-dialog-close-button"
             type="button"
           >
             <span
-              class="bp3-icon bp3-icon-small-cross"
+              aria-hidden="true"
+              class="bp4-icon bp4-icon-small-cross"
               icon="small-cross"
             >
               <svg
@@ -41,9 +48,6 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                 viewBox="0 0 20 20"
                 width="20"
               >
-                <desc>
-                  small-cross
-                </desc>
                 <path
                   d="M11.41 10l3.29-3.29c.19-.18.3-.43.3-.71a1.003 1.003 0 00-1.71-.71L10 8.59l-3.29-3.3a1.003 1.003 0 00-1.42 1.42L8.59 10 5.3 13.29c-.19.18-.3.43-.3.71a1.003 1.003 0 001.71.71l3.29-3.3 3.29 3.29c.18.19.43.3.71.3a1.003 1.003 0 00.71-1.71L11.41 10z"
                   fill-rule="evenodd"
@@ -53,17 +57,18 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
           </button>
         </div>
         <div
-          class="bp3-dialog-body"
+          class="bp4-dialog-body"
         >
           <div
             class="side-bar"
           >
             <button
-              class="bp3-button bp3-intent-primary tab-button"
+              class="bp4-button bp4-intent-primary tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-dashboard"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-dashboard"
                 icon="dashboard"
               >
                 <svg
@@ -72,9 +77,6 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    dashboard
-                  </desc>
                   <path
                     d="M6 5c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zM4 9c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zm6-4c.55 0 1-.45 1-1s-.45-1-1-1-1 .45-1 1 .45 1 1 1zm0-5C4.48 0 0 4.48 0 10s4.48 10 10 10 10-4.48 10-10S15.52 0 10 0zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm6-9c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1zm-8 5c0 1.1.9 2 2 2s2-.9 2-2c0-.33-2-8-2-8s-2 7.67-2 8zm6-9c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1z"
                     fill-rule="evenodd"
@@ -82,17 +84,18 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Status
               </span>
             </button>
             <button
-              class="bp3-button bp3-minimal tab-button"
+              class="bp4-button bp4-minimal tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-align-left"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-align-left"
                 icon="align-left"
               >
                 <svg
@@ -101,9 +104,6 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    align-left
-                  </desc>
                   <path
                     d="M1 7h10c.55 0 1-.45 1-1s-.45-1-1-1H1c-.55 0-1 .45-1 1s.45 1 1 1zm0-4h18c.55 0 1-.45 1-1s-.45-1-1-1H1c-.55 0-1 .45-1 1s.45 1 1 1zm14 14H1c-.55 0-1 .45-1 1s.45 1 1 1h14c.55 0 1-.45 1-1s-.45-1-1-1zm4-8H1c-.55 0-1 .45-1 1s.45 1 1 1h18c.55 0 1-.45 1-1s-.45-1-1-1zM1 15h6c.55 0 1-.45 1-1s-.45-1-1-1H1c-.55 0-1 .45-1 1s.45 1 1 1z"
                     fill-rule="evenodd"
@@ -111,17 +111,18 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Payload
               </span>
             </button>
             <button
-              class="bp3-button bp3-minimal tab-button"
+              class="bp4-button bp4-minimal tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-comparison"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-comparison"
                 icon="comparison"
               >
                 <svg
@@ -130,9 +131,6 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    comparison
-                  </desc>
                   <path
                     d="M6 8H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h5c.55 0 1-.45 1-1V9c0-.55-.45-1-1-1zm13-6h-5c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 3h-5V3h5v2zM6 14H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h5c.55 0 1-.45 1-1v-2c0-.55-.45-1-1-1zM6 2H1c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm4-2c-.55 0-1 .45-1 1v18c0 .55.45 1 1 1s1-.45 1-1V1c0-.55-.45-1-1-1zm9 14h-5c-.55 0-1 .45-1 1v2c0 .55.45 1 1 1h5c.55 0 1-.45 1-1v-2c0-.55-.45-1 [...]
                     fill-rule="evenodd"
@@ -140,17 +138,18 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Reports
               </span>
             </button>
             <button
-              class="bp3-button bp3-minimal tab-button"
+              class="bp4-button bp4-minimal tab-button"
               type="button"
             >
               <span
-                class="bp3-icon bp3-icon-align-justify"
+                aria-hidden="true"
+                class="bp4-icon bp4-icon-align-justify"
                 icon="align-justify"
               >
                 <svg
@@ -159,9 +158,6 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                   viewBox="0 0 20 20"
                   width="20"
                 >
-                  <desc>
-                    align-justify
-                  </desc>
                   <path
                     d="M1 3h18c.55 0 1-.45 1-1s-.45-1-1-1H1c-.55 0-1 .45-1 1s.45 1 1 1zm18 14H1c-.55 0-1 .45-1 1s.45 1 1 1h18c.55 0 1-.45 1-1s-.45-1-1-1zm0-12H1c-.55 0-1 .45-1 1s.45 1 1 1h18c.55 0 1-.45 1-1s-.45-1-1-1zm0 4H1c-.55 0-1 .45-1 1s.45 1 1 1h18c.55 0 1-.45 1-1s-.45-1-1-1zm0 4H1c-.55 0-1 .45-1 1s.45 1 1 1h18c.55 0 1-.45 1-1s-.45-1-1-1z"
                     fill-rule="evenodd"
@@ -169,7 +165,7 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                 </svg>
               </span>
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Logs
               </span>
@@ -185,40 +181,40 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                 class="top-actions"
               >
                 <div
-                  class="bp3-button-group right-buttons"
+                  class="bp4-button-group right-buttons"
                 >
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       Save
                     </span>
                   </button>
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       Copy
                     </span>
                   </button>
                   <button
-                    class="bp3-button bp3-disabled bp3-minimal"
+                    class="bp4-button bp4-disabled bp4-minimal"
                     disabled=""
                     tabindex="-1"
                     type="button"
                   >
                     <span
-                      class="bp3-button-text"
+                      class="bp4-button-text"
                     >
                       View raw
                     </span>
@@ -266,21 +262,24 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-dialog-footer"
+          class="bp4-dialog-footer"
         >
           <div
             class="footer-actions-left"
           >
             <span
-              class="bp3-popover2-target"
+              aria-haspopup="true"
+              class="bp4-popover2-target"
             >
               <button
-                class="bp3-button"
+                class="bp4-button"
                 type="button"
               >
                 <span
-                  class="bp3-icon bp3-icon-wrench"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-wrench"
                   icon="wrench"
+                  tabindex="-1"
                 >
                   <svg
                     data-icon="wrench"
@@ -288,9 +287,6 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      wrench
-                    </desc>
                     <path
                       d="M15.83 3.7l-3.06 3.05-2.84-.7-.7-2.83L12.29.17a5.004 5.004 0 00-4.83 1.29 4.967 4.967 0 00-1.12 5.36L.58 12.58c-.36.36-.58.86-.58 1.41 0 1.1.9 2 2 2 .55 0 1.05-.22 1.41-.59l5.77-5.77c1.79.69 3.91.33 5.35-1.12 1.32-1.3 1.74-3.15 1.3-4.81z"
                       fill-rule="evenodd"
@@ -298,12 +294,13 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                   </svg>
                 </span>
                 <span
-                  class="bp3-button-text"
+                  class="bp4-button-text"
                 >
                   Actions
                 </span>
                 <span
-                  class="bp3-icon bp3-icon-caret-down"
+                  aria-hidden="true"
+                  class="bp4-icon bp4-icon-caret-down"
                   icon="caret-down"
                 >
                   <svg
@@ -312,9 +309,6 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                   >
-                    <desc>
-                      caret-down
-                    </desc>
                     <path
                       d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
                       fill-rule="evenodd"
@@ -325,14 +319,14 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
             </span>
           </div>
           <div
-            class="bp3-dialog-footer-actions"
+            class="bp4-dialog-footer-actions"
           >
             <button
-              class="bp3-button bp3-intent-primary"
+              class="bp4-button bp4-intent-primary"
               type="button"
             >
               <span
-                class="bp3-button-text"
+                class="bp4-button-text"
               >
                 Close
               </span>
@@ -341,6 +335,10 @@ exports[`TaskTableActionDialog matches snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="bp4-overlay-end-focus-trap bp4-overlay-appear bp4-overlay-appear-active"
+      tabindex="0"
+    />
   </div>
 </div>
 `;
diff --git a/web-console/src/entry.scss b/web-console/src/entry.scss
index 021d728bdf..44ce87b059 100644
--- a/web-console/src/entry.scss
+++ b/web-console/src/entry.scss
@@ -38,7 +38,7 @@ body {
 body {
   background: $light-gray4;
 
-  &.bp3-dark {
+  &.#{$bp-ns}-dark {
     background: $dark-gray2;
   }
 
diff --git a/web-console/src/variables.scss b/web-console/src/variables.scss
index 41c3cedf73..e4105e3a11 100644
--- a/web-console/src/variables.scss
+++ b/web-console/src/variables.scss
@@ -18,6 +18,7 @@
 
 @import './blueprint-overrides/common/colors';
 @import './blueprint-overrides/common/variables';
+@import '~@blueprintjs/core/src/common/variables';
 
 $header-bar-height: 50px;
 $view-control-bar-height: 30px;
@@ -35,7 +36,7 @@ $druid-brand-background: #1c1c26;
   border-radius: $pt-border-radius;
   box-shadow: $pt-elevation-shadow-1;
 
-  .bp3-dark & {
+  .#{$bp-ns}-dark & {
     background: $dark-gray3;
     box-shadow: $pt-dark-elevation-shadow-1;
   }
diff --git a/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap b/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap
index 36938a0a44..ed0016b102 100755
--- a/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap
+++ b/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap
@@ -13,44 +13,50 @@ exports[`DatasourcesView matches snapshot 1`] = `
     />
     <Memo(MoreButton)
       altExtra={
-        <Blueprint3.MenuItem
+        <Blueprint4.MenuItem
+          active={false}
           disabled={false}
           icon="compressed"
           intent="danger"
           multiline={false}
           onClick={[Function]}
           popoverProps={Object {}}
+          selected={false}
           shouldDismissPopover={true}
           text="Force compaction run (debug)"
         />
       }
     >
-      <Blueprint3.MenuItem
+      <Blueprint4.MenuItem
+        active={false}
         disabled={true}
         icon="application"
         multiline={false}
         onClick={[Function]}
         popoverProps={Object {}}
+        selected={false}
         shouldDismissPopover={true}
         text="View SQL query for table"
       />
-      <Blueprint3.MenuItem
+      <Blueprint4.MenuItem
+        active={false}
         disabled={false}
         icon="edit"
         multiline={false}
         onClick={[Function]}
         popoverProps={Object {}}
+        selected={false}
         shouldDismissPopover={true}
         text="Edit default retention rules"
       />
     </Memo(MoreButton)>
-    <Blueprint3.Switch
+    <Blueprint4.Switch
       checked={false}
       disabled={false}
       label="Show unused"
       onChange={[Function]}
     />
-    <Blueprint3.Switch
+    <Blueprint4.Switch
       checked={false}
       disabled={false}
       label="Show segment timeline"
diff --git a/web-console/src/views/home-view/datasources-card/__snapshots__/datasources-card.spec.tsx.snap b/web-console/src/views/home-view/datasources-card/__snapshots__/datasources-card.spec.tsx.snap
index 5edb32d566..97a6ee44f6 100644
--- a/web-console/src/views/home-view/datasources-card/__snapshots__/datasources-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/datasources-card/__snapshots__/datasources-card.spec.tsx.snap
@@ -6,13 +6,14 @@ exports[`DatasourcesCard matches snapshot 1`] = `
   href="#datasources"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-multi-select"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-multi-select"
         icon="multi-select"
       >
         <svg
@@ -22,9 +23,6 @@ exports[`DatasourcesCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            multi-select
-          </desc>
           <path
             d="M12 3.98H4c-.55 0-1 .45-1 1v1h8v5h1c.55 0 1-.45 1-1v-5c0-.55-.45-1-1-1zm3-3H7c-.55 0-1 .45-1 1v1h8v5h1c.55 0 1-.45 1-1v-5c0-.55-.45-1-1-1zm-6 6H1c-.55 0-1 .45-1 1v5c0 .55.45 1 1 1h8c.55 0 1-.45 1-1v-5c0-.55-.45-1-1-1zm-1 5H2v-3h6v3z"
             fill-rule="evenodd"
diff --git a/web-console/src/views/home-view/home-view-card/__snapshots__/home-view-card.spec.tsx.snap b/web-console/src/views/home-view/home-view-card/__snapshots__/home-view-card.spec.tsx.snap
index e99d4f360a..2b32aa489d 100644
--- a/web-console/src/views/home-view/home-view-card/__snapshots__/home-view-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/home-view-card/__snapshots__/home-view-card.spec.tsx.snap
@@ -6,13 +6,14 @@ exports[`HomeViewCard matches snapshot 1`] = `
   href="#somewhere"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-database"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-database"
         icon="database"
       >
         <svg
@@ -22,9 +23,6 @@ exports[`HomeViewCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            database
-          </desc>
           <path
             d="M8 4c3.31 0 6-.9 6-2s-2.69-2-6-2C4.68 0 2 .9 2 2s2.68 2 6 2zm-6-.48V8c0 1.1 2.69 2 6 2s6-.9 6-2V3.52C12.78 4.4 10.56 5 8 5s-4.78-.6-6-1.48zm0 6V14c0 1.1 2.69 2 6 2s6-.9 6-2V9.52C12.78 10.4 10.56 11 8 11s-4.78-.6-6-1.48z"
             fill-rule="evenodd"
diff --git a/web-console/src/views/home-view/home-view-card/home-view-card.scss b/web-console/src/views/home-view/home-view-card/home-view-card.scss
index ef5eb2bb06..171f99b1cf 100644
--- a/web-console/src/views/home-view/home-view-card/home-view-card.scss
+++ b/web-console/src/views/home-view/home-view-card/home-view-card.scss
@@ -20,7 +20,7 @@
 @import '../../../blueprint-overrides/common/colors';
 
 .home-view-card {
-  .bp3-card {
+  .#{$bp-ns}-card {
     height: 170px;
   }
 
@@ -42,7 +42,7 @@
       height: 20px;
       fill: $blue3;
 
-      .bp3-dark & {
+      .#{$bp-ns}-dark & {
         fill: $druid-brand;
       }
     }
@@ -51,7 +51,7 @@
 
 a.home-view-card,
 a.home-view-card:hover {
-  .bp3-dark & {
+  .#{$bp-ns}-dark & {
     color: $gray4;
   }
   color: $gray2;
diff --git a/web-console/src/views/home-view/lookups-card/__snapshots__/lookups-card.spec.tsx.snap b/web-console/src/views/home-view/lookups-card/__snapshots__/lookups-card.spec.tsx.snap
index 9e1b0ff5b9..af0c8928f8 100644
--- a/web-console/src/views/home-view/lookups-card/__snapshots__/lookups-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/lookups-card/__snapshots__/lookups-card.spec.tsx.snap
@@ -6,13 +6,14 @@ exports[`LookupsCard matches snapshot 1`] = `
   href="#lookups"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-properties"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-properties"
         icon="properties"
       >
         <svg
@@ -22,9 +23,6 @@ exports[`LookupsCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            properties
-          </desc>
           <path
             d="M2 6C.9 6 0 6.9 0 8s.9 2 2 2 2-.9 2-2-.9-2-2-2zm4-3h9c.55 0 1-.45 1-1s-.45-1-1-1H6c-.55 0-1 .45-1 1s.45 1 1 1zm-4 9c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm13-5H6c-.55 0-1 .45-1 1s.45 1 1 1h9c.55 0 1-.45 1-1s-.45-1-1-1zm0 6H6c-.55 0-1 .45-1 1s.45 1 1 1h9c.55 0 1-.45 1-1s-.45-1-1-1zM2 0C.9 0 0 .9 0 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"
             fill-rule="evenodd"
diff --git a/web-console/src/views/home-view/segments-card/__snapshots__/segments-card.spec.tsx.snap b/web-console/src/views/home-view/segments-card/__snapshots__/segments-card.spec.tsx.snap
index 0bda900753..e9f168cbb4 100644
--- a/web-console/src/views/home-view/segments-card/__snapshots__/segments-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/segments-card/__snapshots__/segments-card.spec.tsx.snap
@@ -6,13 +6,14 @@ exports[`SegmentsCard matches snapshot 1`] = `
   href="#segments"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-stacked-chart"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-stacked-chart"
         icon="stacked-chart"
       >
         <svg
@@ -22,9 +23,6 @@ exports[`SegmentsCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            stacked-chart
-          </desc>
           <path
             d="M10 2c0-.55-.45-1-1-1H8c-.55 0-1 .45-1 1v3h3V2zm3 10h1c.55 0 1-.45 1-1V8h-3v3c0 .55.45 1 1 1zm2-7c0-.55-.45-1-1-1h-1c-.55 0-1 .45-1 1v2h3V5zm-5 1H7v3h3V6zM5 7c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v1h3V7zm3 5h1c.55 0 1-.45 1-1v-1H7v1c0 .55.45 1 1 1zm7 1H2c-.55 0-1 .45-1 1s.45 1 1 1h13c.55 0 1-.45 1-1s-.45-1-1-1zM3 12h1c.55 0 1-.45 1-1V9H2v2c0 .55.45 1 1 1z"
             fill-rule="evenodd"
diff --git a/web-console/src/views/home-view/services-card/__snapshots__/services-card.spec.tsx.snap b/web-console/src/views/home-view/services-card/__snapshots__/services-card.spec.tsx.snap
index 73f277e043..838ee82bbe 100644
--- a/web-console/src/views/home-view/services-card/__snapshots__/services-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/services-card/__snapshots__/services-card.spec.tsx.snap
@@ -6,13 +6,14 @@ exports[`ServicesCard matches snapshot 1`] = `
   href="#services"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-database"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-database"
         icon="database"
       >
         <svg
@@ -22,9 +23,6 @@ exports[`ServicesCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            database
-          </desc>
           <path
             d="M8 4c3.31 0 6-.9 6-2s-2.69-2-6-2C4.68 0 2 .9 2 2s2.68 2 6 2zm-6-.48V8c0 1.1 2.69 2 6 2s6-.9 6-2V3.52C12.78 4.4 10.56 5 8 5s-4.78-.6-6-1.48zm0 6V14c0 1.1 2.69 2 6 2s6-.9 6-2V9.52C12.78 10.4 10.56 11 8 11s-4.78-.6-6-1.48z"
             fill-rule="evenodd"
diff --git a/web-console/src/views/home-view/status-card/__snapshots__/status-card.spec.tsx.snap b/web-console/src/views/home-view/status-card/__snapshots__/status-card.spec.tsx.snap
index 5b471137b7..3371c12eb1 100644
--- a/web-console/src/views/home-view/status-card/__snapshots__/status-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/status-card/__snapshots__/status-card.spec.tsx.snap
@@ -5,13 +5,14 @@ exports[`StatusCard matches snapshot 1`] = `
   class="home-view-card status-card"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-graph"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-graph"
         icon="graph"
       >
         <svg
@@ -21,9 +22,6 @@ exports[`StatusCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            graph
-          </desc>
           <path
             d="M14 3c-1.06 0-1.92.83-1.99 1.88l-1.93.97A2.95 2.95 0 008 5c-.56 0-1.08.16-1.52.43L3.97 3.34C3.98 3.23 4 3.12 4 3c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2c.24 0 .47-.05.68-.13l2.51 2.09C5.08 7.29 5 7.63 5 8c0 .96.46 1.81 1.16 2.35l-.56 1.69c-.91.19-1.6.99-1.6 1.96 0 1.1.9 2 2 2s2-.9 2-2c0-.51-.2-.97-.51-1.32l.56-1.69A2.99 2.99 0 0011 8c0-.12-.02-.24-.04-.36l1.94-.97c.32.21.69.33 1.1.33 1.1 0 2-.9 2-2s-.9-2-2-2z"
             fill-rule="evenodd"
diff --git a/web-console/src/views/home-view/supervisors-card/__snapshots__/supervisors-card.spec.tsx.snap b/web-console/src/views/home-view/supervisors-card/__snapshots__/supervisors-card.spec.tsx.snap
index 757274c819..85dfba3fbe 100644
--- a/web-console/src/views/home-view/supervisors-card/__snapshots__/supervisors-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/supervisors-card/__snapshots__/supervisors-card.spec.tsx.snap
@@ -6,13 +6,14 @@ exports[`SupervisorsCard matches snapshot 1`] = `
   href="#ingestion"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-list-columns"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-list-columns"
         icon="list-columns"
       >
         <svg
@@ -22,9 +23,6 @@ exports[`SupervisorsCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            list-columns
-          </desc>
           <path
             d="M6 1c.55 0 1 .45 1 1s-.45 1-1 1H1c-.55 0-1-.45-1-1s.45-1 1-1h5zm0 4c.55 0 1 .45 1 1s-.45 1-1 1H1c-.55 0-1-.45-1-1s.45-1 1-1h5zm0 4c.55 0 1 .45 1 1s-.45 1-1 1H1c-.55 0-1-.45-1-1s.45-1 1-1h5zm0 4c.55 0 1 .45 1 1s-.45 1-1 1H1c-.55 0-1-.45-1-1s.45-1 1-1h5zm9-12c.55 0 1 .45 1 1s-.45 1-1 1h-5c-.55 0-1-.45-1-1s.45-1 1-1h5zm0 4c.55 0 1 .45 1 1s-.45 1-1 1h-5c-.55 0-1-.45-1-1s.45-1 1-1h5zm0 4c.55 0 1 .45 1 1s-.45 1-1 1h-5c-.55 0-1-.45-1-1s.45-1 1-1h5zm0 4c.55 0 1 .45 1 1s-.45 1-1 1h [...]
             fill-rule="evenodd"
diff --git a/web-console/src/views/home-view/tasks-card/__snapshots__/tasks-card.spec.tsx.snap b/web-console/src/views/home-view/tasks-card/__snapshots__/tasks-card.spec.tsx.snap
index 163c39ad41..531f3cb44a 100644
--- a/web-console/src/views/home-view/tasks-card/__snapshots__/tasks-card.spec.tsx.snap
+++ b/web-console/src/views/home-view/tasks-card/__snapshots__/tasks-card.spec.tsx.snap
@@ -6,13 +6,14 @@ exports[`TasksCard matches snapshot 1`] = `
   href="#ingestion"
 >
   <div
-    class="bp3-card bp3-interactive bp3-elevation-1"
+    class="bp4-card bp4-interactive bp4-elevation-1"
   >
     <h5
-      class="bp3-heading"
+      class="bp4-heading"
     >
       <span
-        class="bp3-icon bp3-icon-gantt-chart"
+        aria-hidden="true"
+        class="bp4-icon bp4-icon-gantt-chart"
         icon="gantt-chart"
       >
         <svg
@@ -22,9 +23,6 @@ exports[`TasksCard matches snapshot 1`] = `
           viewBox="0 0 16 16"
           width="16"
         >
-          <desc>
-            gantt-chart
-          </desc>
           <path
             d="M10 10c0 .55.45 1 1 1h4c.55 0 1-.45 1-1s-.45-1-1-1h-4c-.55 0-1 .45-1 1zM6 7c0 .55.45 1 1 1h4c.55 0 1-.45 1-1s-.45-1-1-1H7c-.55 0-1 .45-1 1zm9 5H2V3c0-.55-.45-1-1-1s-1 .45-1 1v10c0 .55.45 1 1 1h14c.55 0 1-.45 1-1s-.45-1-1-1zM4 5h3c.55 0 1-.45 1-1s-.45-1-1-1H4c-.55 0-1 .45-1 1s.45 1 1 1z"
             fill-rule="evenodd"
diff --git a/web-console/src/views/ingestion-view/__snapshots__/ingestion-view.spec.tsx.snap b/web-console/src/views/ingestion-view/__snapshots__/ingestion-view.spec.tsx.snap
index 61681308ab..3ae3f3026a 100644
--- a/web-console/src/views/ingestion-view/__snapshots__/ingestion-view.spec.tsx.snap
+++ b/web-console/src/views/ingestion-view/__snapshots__/ingestion-view.spec.tsx.snap
@@ -25,49 +25,59 @@ exports[`IngestionView matches snapshot 1`] = `
           onRefresh={[Function]}
         />
         <Memo(MoreButton)>
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="application"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="View SQL query for table"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="manually-entered-data"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Submit JSON supervisor"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="play"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Resume all supervisors"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="pause"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Suspend all supervisors"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="cross"
             intent="danger"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Terminate all supervisors"
           />
@@ -279,58 +289,62 @@ exports[`IngestionView matches snapshot 1`] = `
         <Component>
           Group by
         </Component>
-        <Blueprint3.ButtonGroup>
-          <Blueprint3.Button
+        <Blueprint4.ButtonGroup>
+          <Blueprint4.Button
             active={true}
             onClick={[Function]}
           >
             None
-          </Blueprint3.Button>
-          <Blueprint3.Button
+          </Blueprint4.Button>
+          <Blueprint4.Button
             active={false}
             onClick={[Function]}
           >
             Group ID
-          </Blueprint3.Button>
-          <Blueprint3.Button
+          </Blueprint4.Button>
+          <Blueprint4.Button
             active={false}
             onClick={[Function]}
           >
             Type
-          </Blueprint3.Button>
-          <Blueprint3.Button
+          </Blueprint4.Button>
+          <Blueprint4.Button
             active={false}
             onClick={[Function]}
           >
             Datasource
-          </Blueprint3.Button>
-          <Blueprint3.Button
+          </Blueprint4.Button>
+          <Blueprint4.Button
             active={false}
             onClick={[Function]}
           >
             Status
-          </Blueprint3.Button>
-        </Blueprint3.ButtonGroup>
+          </Blueprint4.Button>
+        </Blueprint4.ButtonGroup>
         <Memo(RefreshButton)
           localStorageKey="task-refresh-rate"
           onRefresh={[Function]}
         />
         <Memo(MoreButton)>
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="application"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="View SQL query for table"
           />
-          <Blueprint3.MenuItem
+          <Blueprint4.MenuItem
+            active={false}
             disabled={false}
             icon="manually-entered-data"
             multiline={false}
             onClick={[Function]}
             popoverProps={Object {}}
+            selected={false}
             shouldDismissPopover={true}
             text="Submit JSON task"
           />
@@ -585,7 +599,7 @@ exports[`IngestionView matches snapshot 1`] = `
       />
     </div>
   </t>
-  <Blueprint3.Alert
+  <Blueprint4.Alert
     canEscapeKeyCancel={false}
     canOutsideClickCancel={false}
     confirmButtonText="OK"
@@ -596,6 +610,6 @@ exports[`IngestionView matches snapshot 1`] = `
     onConfirm={[Function]}
   >
     <p />
-  </Blueprint3.Alert>
+  </Blueprint4.Alert>
 </Fragment>
 `;
diff --git a/web-console/src/views/load-data-view/__snapshots__/load-data-view.spec.tsx.snap b/web-console/src/views/load-data-view/__snapshots__/load-data-view.spec.tsx.snap
index bbf8df8b4d..46856e84ee 100644
--- a/web-console/src/views/load-data-view/__snapshots__/load-data-view.spec.tsx.snap
+++ b/web-console/src/views/load-data-view/__snapshots__/load-data-view.spec.tsx.snap
@@ -5,7 +5,7 @@ exports[`LoadDataView matches snapshot 1`] = `
   className="load-data-view app-view welcome"
 >
   <div
-    className="bp3-tabs step-nav"
+    className="bp4-tabs step-nav"
   >
     <div
       className="step-section"
@@ -16,10 +16,10 @@ exports[`LoadDataView matches snapshot 1`] = `
       >
         Connect and parse raw data
       </div>
-      <Blueprint3.ButtonGroup
+      <Blueprint4.ButtonGroup
         className="step-nav-l2"
       >
-        <Blueprint3.Button
+        <Blueprint4.Button
           active={true}
           className="welcome"
           disabled={false}
@@ -28,7 +28,7 @@ exports[`LoadDataView matches snapshot 1`] = `
           onClick={[Function]}
           text="Start"
         />
-        <Blueprint3.Button
+        <Blueprint4.Button
           active={false}
           className="connect"
           disabled={true}
@@ -37,7 +37,7 @@ exports[`LoadDataView matches snapshot 1`] = `
           onClick={[Function]}
           text="Connect"
         />
-        <Blueprint3.Button
+        <Blueprint4.Button
           active={false}
           className="parser"
           disabled={true}
@@ -46,7 +46,7 @@ exports[`LoadDataView matches snapshot 1`] = `
           onClick={[Function]}
           text="Parse data"
         />
-      </Blueprint3.ButtonGroup>
+      </Blueprint4.ButtonGroup>
     </div>
     <div
       className="step-section"
@@ -57,10 +57,10 @@ exports[`LoadDataView matches snapshot 1`] = `
       >
         Transform data and configure schema
       </div>
-      <Blueprint3.ButtonGroup
+      <Blueprint4.ButtonGroup
         className="step-nav-l2"
       >
-        <Blueprint3.Button
+        <Blueprint4.Button
           active={false}
           className="timestamp"
           disabled={true}
@@ -69,7 +69,7 @@ exports[`LoadDataView matches snapshot 1`] = `
           onClick={[Function]}
           text="Parse time"
         />
-        <Blueprint3.Button
+        <Blueprint4.Button
           active={false}
           className="transform"
           disabled={true}
@@ -78,7 +78,7 @@ exports[`LoadDataView matches snapshot 1`] = `
           onClick={[Function]}
           text="Transform"
         />
-        <Blueprint3.Button
+        <Blueprint4.Button
           active={false}
           className="filter"
           disabled={true}
@@ -87,7 +87,7 @@ exports[`LoadDataView matches snapshot 1`] = `
           onClick={[Function]}
           text="Filter"
         />
-        <Blueprint3.Button
+        <Blueprint4.Button
           active={false}
           className="schema"
           disabled={true}
@@ -96,7 +96,7 @@ exports[`LoadDataView matches snapshot 1`] = `
           onClick={[Function]}
           text="Configure schema"
         />
-      </Blueprint3.ButtonGroup>
+      </Blueprint4.ButtonGroup>
     </div>
     <div
       className="step-section"
@@ -107,10 +107,10 @@ exports[`LoadDataView matches snapshot 1`] = `
       >
         Tune parameters
       </div>
-      <Blueprint3.ButtonGroup
+      <Blueprint4.ButtonGroup
         className="step-nav-l2"
       >
... 3316 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org