diff --git a/client-app/src/desktop/tabs/home/widgets/roadmap/RoadmapWidget.scss b/client-app/src/desktop/tabs/home/widgets/roadmap/RoadmapWidget.scss
index 984352b78..7857f28ea 100644
--- a/client-app/src/desktop/tabs/home/widgets/roadmap/RoadmapWidget.scss
+++ b/client-app/src/desktop/tabs/home/widgets/roadmap/RoadmapWidget.scss
@@ -60,7 +60,7 @@
   background-color: var(--xh-bg-alt);
   padding: var(--xh-pad-half-px);
 
-  .bp5-popover-content {
+  .bp6-popover-content {
     background-color: var(--xh-bg-alt) !important;
   }
 
diff --git a/client-app/src/desktop/tabs/layout/widgets/ChartWidget.scss b/client-app/src/desktop/tabs/layout/widgets/ChartWidget.scss
index a034f0243..a12eda272 100644
--- a/client-app/src/desktop/tabs/layout/widgets/ChartWidget.scss
+++ b/client-app/src/desktop/tabs/layout/widgets/ChartWidget.scss
@@ -1,5 +1,5 @@
-.xh-app .tb-chart-widget__buttons .xh-button.bp5-button.xh-button--enabled:focus,
-.xh-app.xh-dark .tb-chart-widget__buttons .xh-button.bp5-button.xh-button--enabled:focus,
-.xh-app.xh-dark.bp5-dark .tb-chart-widget__buttons .xh-button.bp5-button.xh-button--enabled:focus {
+.xh-app .tb-chart-widget__buttons .xh-button.bp6-button.xh-button--enabled:focus,
+.xh-app.xh-dark .tb-chart-widget__buttons .xh-button.bp6-button.xh-button--enabled:focus,
+.xh-app.xh-dark.bp6-dark .tb-chart-widget__buttons .xh-button.bp6-button.xh-button--enabled:focus {
   outline: none !important;
 }
diff --git a/client-app/src/desktop/tabs/other/exceptions/ExceptionHandlerPanel.tsx b/client-app/src/desktop/tabs/other/exceptions/ExceptionHandlerPanel.tsx
index 21d9a3fd7..de6afaa87 100644
--- a/client-app/src/desktop/tabs/other/exceptions/ExceptionHandlerPanel.tsx
+++ b/client-app/src/desktop/tabs/other/exceptions/ExceptionHandlerPanel.tsx
@@ -144,8 +144,8 @@ const displayOptions = hoistCmp.factory<ExceptionHandlerModel>(({model}) =>
                     alignItems: 'center',
                     items: [
                         label({
-                            className: `bp5-control bp5-switch bp5-inline bp5-align-right xh-input xh-switch-input${
-                                !model.showAlert ? ' bp5-disabled xh-input-disabled' : ''
+                            className: `bp6-control bp6-switch bp6-inline bp6-align-right xh-input xh-switch-input${
+                                !model.showAlert ? ' bp6-disabled xh-input-disabled' : ''
                             }`,
                             item: 'Alert Type'
                         }),
diff --git a/client-app/src/desktop/tabs/other/formats/Formats.scss b/client-app/src/desktop/tabs/other/formats/Formats.scss
index a3cd601c2..d0e7c388b 100644
--- a/client-app/src/desktop/tabs/other/formats/Formats.scss
+++ b/client-app/src/desktop/tabs/other/formats/Formats.scss
@@ -33,7 +33,7 @@
       margin: 0;
       padding: 15px 10px;
 
-      .bp5-slider {
+      .bp6-slider {
         margin-top: 2px; // avoid clipped slider handle
       }
     }