diff --git a/reportbuilder/templates/local/filters/header.mustache b/reportbuilder/templates/local/filters/header.mustache
index c6492bc12db..5a3bf473e14 100644
--- a/reportbuilder/templates/local/filters/header.mustache
+++ b/reportbuilder/templates/local/filters/header.mustache
@@ -24,7 +24,7 @@
         "name": "Date modified"
     }
 }}
-<div class="filter pb-4 mb-3 border-bottom" data-filter-for="{{name}}">
+<div class="filter pb-3 mb-3 border-bottom" data-filter-for="{{name}}">
     <div class="filter-header d-flex align-items-start justify-content-between">
         <div class="filter-name">
             {{{name}}}
diff --git a/theme/boost/scss/moodle/reportbuilder.scss b/theme/boost/scss/moodle/reportbuilder.scss
index abed4b5eddf..dc6ca46a939 100644
--- a/theme/boost/scss/moodle/reportbuilder.scss
+++ b/theme/boost/scss/moodle/reportbuilder.scss
@@ -1,8 +1,25 @@
 /**
-* Reportbuilder.
+* Reportbuilder styles.
 */
 
-/* Table */
+//
+// General styles
+//
+
+// Button styles when a toggle button is active.
+.reportbuilder-wrapper {
+    .btn-outline-secondary[data-toggle="collapse"]:not(.collapsed),
+    .dropdown.show .btn-outline-secondary[data-toggle="dropdown"] {
+        color: color-yiq($gray-600);
+        background-color: $gray-600;
+        border-color: $gray-600;
+    }
+}
+
+//
+// Table
+//
+
 .reportbuilder-table {
     td {
         @extend .align-middle;
@@ -12,71 +29,134 @@
     }
 }
 
-/* Filters */
-.reportbuilder-wrapper {
-    .filters-dropdown {
-        width: 27rem;
-        padding: 0;
-        z-index: $zindex-modal;
-        overflow: hidden;
-        @include media-breakpoint-down(sm) {
-            width: 100%;
-        }
-        .reportbuilder-filters-sidebar {
-            max-height: calc(100vh - #{$navbar-height} - 1rem);
-            overflow-y: auto;
-            @include thin-scrolls($white);
-        }
+//
+// Filters
+//
+
+$rb-filters-dropdown-width: 27rem !default;
+
+.reportbuilder-wrapper .filters-dropdown {
+    width: $rb-filters-dropdown-width;
+    padding: 0;
+    z-index: $zindex-modal;
+    overflow: hidden;
+    @include media-breakpoint-down(sm) {
+        width: 100%;
     }
-    .reportbuilder-filters-wrapper,
-    .reportbuilder-conditions-list {
-        .mform {
-            &.full-width-labels {
-                .fitem.row {
-                    > .col-md-3,
-                    > .col-md-9 {
-                        flex: 0 0 100%;
-                        max-width: 100%;
-                    }
-                    .fdate_selector {
-                        flex-wrap: wrap;
-                    }
-                }
+}
+.reportbuilder-filters-sidebar {
+    max-height: calc(100vh - #{$navbar-height} - 1rem);
+    overflow-y: auto;
+    @include thin-scrolls($white);
+    .filter {
+        .filter-header {
+            font-size: $h5-font-size;
+            .filter-name {
+                font-size: $font-size-base;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                padding-right: map-get($spacers, 3);
             }
-            .form-group {
-                margin-bottom: 0;
-                max-width: 100%;
-                > span {
-                    max-width: 100%;
-                }
-            }
-        }
-        .filter {
-            .filter-header {
-                font-size: $h5-font-size;
-                .filter-name {
-                    font-size: 1rem;
-                    white-space: nowrap;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    padding-right: 1rem;
-                }
-                .filter-name:hover {
-                    white-space: normal;
-                    text-overflow: clip;
-                    word-break: break-all;
-                }
+            .filter-name:hover {
+                white-space: normal;
+                text-overflow: clip;
+                word-break: break-all;
             }
         }
     }
 }
 
-/**
-* Custom Reports.
-*/
+//
+// Inline forms
+//
 
-$rb-left-sidebar-width: 250px;
-$rb-right-sidebar-width: 350px;
+.reportbuilder-filters-wrapper,
+.reportbuilder-conditions-list {
+    .mform.full-width-labels {
+        .fdate_selector {
+            flex-wrap: wrap;
+        }
+        .form-group {
+            margin-bottom: 0;
+            max-width: 100%;
+        }
+        .form-group:not(.row):last-child {
+            flex: 1;
+            min-width: 0;
+            span,
+            .custom-select {
+                width: 100%;
+            }
+        }
+    }
+}
+
+//
+// Custom Reports
+//
+
+$rb-left-sidebar-width: 250px !default;
+$rb-right-sidebar-width: 350px !default;
+
+// Reportbuilder full page layout
+
+@include media-breakpoint-up(lg) {
+    $tabs-height: 83px;
+    $sidebar-margin-top: $navbar-height + $tabs-height + 20px;
+    .path-admin-reportbuilder.pagelayout-popup {
+        // Fix for behat-site defined in theme/boost/scss/moodle/debug.scss:7 is not needed. Override it.
+        &.behat-site .fixed-top {
+            position: fixed;
+        }
+        #region-main {
+            border: none;
+            padding: 0;
+        }
+        #maincontent {
+            visibility: hidden;
+        }
+        .dynamictabs .nav-tabs {
+            position: fixed;
+            z-index: $zindex-fixed;
+            width: calc(100% - 35px);
+            padding-top: 1.25rem;
+            background-color: $white;
+            // Small hack to simulate padding bottom after nav-tabs border.
+            box-shadow: 0 1.25rem 0 $white;
+        }
+        .dynamictabs .tab-content {
+            padding-top: $tabs-height;
+        }
+        .reportbuilder-sidebar-menu {
+            position: fixed;
+            .reportbuilder-sidebar-menu-cards {
+                max-height: calc(100vh - #{$sidebar-margin-top} - 52px); // 52px corresponds to "search" input size.
+            }
+        }
+        .reportbuilder-sidebar-settings {
+            position: fixed;
+            right: 30px;
+            max-height: calc(100vh - #{$sidebar-margin-top});
+        }
+        .reportbuilder-report[data-editing] .reportbuilder-report-container {
+            max-height: calc(100vh - #{$sidebar-margin-top});
+            overflow-y: auto;
+            @include thin-scrolls($gray-100);
+            margin-left: calc(#{$rb-left-sidebar-width} + 1rem);
+            margin-right: calc(#{$rb-right-sidebar-width} + 1rem);
+        }
+        .reportbuilder-audiences-container {
+            margin-left: calc(#{$rb-left-sidebar-width} + 1rem);
+        }
+    }
+}
+// Fix popper.js behaviour in fullpage report (using 'popup' page layout).
+#page-admin-reportbuilder-edit #page {
+    overflow-y: auto;
+}
+
+// Main content in "Editor" tab (report table)
 
 .reportbuilder-report-container {
     @extend .flex-fill;
@@ -89,8 +169,7 @@ $rb-right-sidebar-width: 350px;
 .reportbuilder-editor-table-container {
     overflow-x: auto;
 }
-
-/* Custom table headers */
+// Custom table headers.
 .reportbuilder-table th {
     button[data-action="report-remove-column"],
     span[data-drag-type="move"] {
@@ -107,7 +186,8 @@ $rb-right-sidebar-width: 350px;
     }
 }
 
-/* Sidebar menu */
+// Left sidebar menu in "Editor" tab (columns)
+
 .reportbuilder-sidebar-menu {
     @include media-breakpoint-up(lg) {
         width: $rb-left-sidebar-width;
@@ -127,7 +207,8 @@ $rb-right-sidebar-width: 350px;
     @include thin-scrolls($gray-100);
 }
 
-/* Settings sidebar */
+// Right sidebar menu in "Editor" tab  (settings)
+
 .reportbuilder-sidebar-settings {
     overflow-y: auto;
     @include thin-scrolls($gray-100);
@@ -172,17 +253,8 @@ $rb-right-sidebar-width: 350px;
     }
 }
 
-/* Add button styles when a toggle button is active. */
-.reportbuilder-wrapper {
-    button.btn-outline-secondary[data-toggle="collapse"]:not(.collapsed),
-    .dropdown.show button.btn-outline-secondary[data-toggle="dropdown"] {
-        color: color-yiq($gray-600);
-        background-color: $gray-600;
-        border-color: $gray-600;
-    }
-}
+// Drag&drop styles
 
-/* Drag&drop styles. */
 .reportbuilder-sortable-list li,
 .reportbuilder-table th,
 .reportbuilder-conditions-list .condition {
@@ -195,62 +267,8 @@ $rb-right-sidebar-width: 350px;
     }
 }
 
-/* Reportbuilder full page styles. */
-@include media-breakpoint-up(lg) {
-    $tabs-height: 83px;
-    $sidebar-margin-top: $navbar-height + $tabs-height + 20px;
-    .path-admin-reportbuilder.pagelayout-popup {
-        // Fix for behat-site defined in theme/boost/scss/moodle/debug.scss:7 is not needed. Override it.
-        &.behat-site .fixed-top {
-            position: fixed;
-        }
-        #region-main {
-            border: none;
-            padding: 0;
-        }
-        #maincontent {
-            visibility: hidden;
-        }
-        .dynamictabs .nav-tabs {
-            position: fixed;
-            z-index: $zindex-fixed;
-            width: calc(100% - 35px);
-            padding-top: 1.25rem;
-            background-color: $white;
-            box-shadow: 0 1.25rem 0 $white; // Small hack to simulate padding bottom after nav-tabs border.
-        }
-        .dynamictabs .tab-content {
-            padding-top: $tabs-height;
-        }
-        .reportbuilder-sidebar-menu {
-            position: fixed;
-            .reportbuilder-sidebar-menu-cards {
-                max-height: calc(100vh - #{$sidebar-margin-top} - 52px); // 52px corresponds to "search" input size.
-            }
-        }
-        .reportbuilder-sidebar-settings {
-            position: fixed;
-            right: 30px;
-            max-height: calc(100vh - #{$sidebar-margin-top});
-        }
-        .reportbuilder-report[data-editing] .reportbuilder-report-container {
-            max-height: calc(100vh - #{$sidebar-margin-top});
-            overflow-y: auto;
-            @include thin-scrolls($gray-100);
-            margin-left: calc(#{$rb-left-sidebar-width} + 1rem);
-            margin-right: calc(#{$rb-right-sidebar-width} + 1rem);
-        }
-        .reportbuilder-audiences-container {
-            margin-left: calc(#{$rb-left-sidebar-width} + 1rem);
-        }
-    }
-}
-// Fix popper.js behaviour in fullpage report (using 'popup' page layout).
-#page-admin-reportbuilder-edit #page {
-    overflow-y: auto;
-}
+// Toggle cards
 
-/* Toggle cards. */
 .reportbuilder-toggle-card {
     .card-header {
         border-bottom: none;
@@ -282,9 +300,10 @@ $rb-right-sidebar-width: 350px;
     }
 }
 
-/* Audiences. */
+// Audiences tab
+
 .reportbuilder-audiences-container {
-    /* 'OR' separator. */
+    // 'OR' separator.
     .audience-separator {
         text-transform: uppercase;
         &::before,
@@ -300,7 +319,7 @@ $rb-right-sidebar-width: 350px;
             margin-left: 1rem;
         }
     }
-    /* Card action icons. */
+    // Card action icons.
     .instance-card {
         .card-header {
             i.icon {
@@ -310,7 +329,12 @@ $rb-right-sidebar-width: 350px;
     }
 }
 
-/* Report table card view styles */
+//
+// Card view.
+//
+
+// Mixin to covert a report table in a card
+
 @mixin table-cards {
     table.reportbuilder-table {
         thead {
@@ -375,6 +399,9 @@ $rb-right-sidebar-width: 350px;
         }
     }
 }
+
+// Logic to apply card-view mixin when necessary
+
 .reportbuilder-report[data-report-type="0"]:not([data-editing]) {
     // Report card view for small screens (if not forcing table).
     @include media-breakpoint-down(xs) {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 2539d6efa06..d8e26e9b01b 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -37764,14 +37764,19 @@ div.editor_atto_toolbar button .icon {
 }
 
 /**
-* Reportbuilder.
+* Reportbuilder styles.
 */
-/* Table */
+.reportbuilder-wrapper .btn-outline-secondary[data-toggle=collapse]:not(.collapsed),
+.reportbuilder-wrapper .dropdown.show .btn-outline-secondary[data-toggle=dropdown] {
+  color: #fff;
+  background-color: #6a737b;
+  border-color: #6a737b;
+}
+
 .reportbuilder-table .action-menu .menubar {
   justify-content: end;
 }
 
-/* Filters */
 .reportbuilder-wrapper .filters-dropdown {
   width: 27rem;
   padding: 0;
@@ -37783,208 +37788,64 @@ div.editor_atto_toolbar button .icon {
     width: 100%;
   }
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar {
+
+.reportbuilder-filters-sidebar {
   max-height: calc(100vh - 60px - 1rem);
   overflow-y: auto;
   scrollbar-width: thin;
   scrollbar-color: #6a737b #fff;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar {
+.reportbuilder-filters-sidebar::-webkit-scrollbar {
   width: 12px;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar-track {
+.reportbuilder-filters-sidebar::-webkit-scrollbar-track {
   background: #fff;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar-thumb {
+.reportbuilder-filters-sidebar::-webkit-scrollbar-thumb {
   background-color: #6a737b;
   border-radius: 20px;
   border: 3px solid #fff;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar-thumb:hover {
+.reportbuilder-filters-sidebar::-webkit-scrollbar-thumb:hover {
   background-color: #495057;
 }
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform.full-width-labels .fitem.row > .col-md-3,
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform.full-width-labels .fitem.row > .col-md-9,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform.full-width-labels .fitem.row > .col-md-3,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform.full-width-labels .fitem.row > .col-md-9 {
-  flex: 0 0 100%;
-  max-width: 100%;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform.full-width-labels .fitem.row .fdate_selector,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform.full-width-labels .fitem.row .fdate_selector {
-  flex-wrap: wrap;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform .form-group,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform .form-group {
-  margin-bottom: 0;
-  max-width: 100%;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform .form-group > span,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform .form-group > span {
-  max-width: 100%;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .filter .filter-header,
-.reportbuilder-wrapper .reportbuilder-conditions-list .filter .filter-header {
+.reportbuilder-filters-sidebar .filter .filter-header {
   font-size: 1.171875rem;
 }
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .filter .filter-header .filter-name,
-.reportbuilder-wrapper .reportbuilder-conditions-list .filter .filter-header .filter-name {
-  font-size: 1rem;
+.reportbuilder-filters-sidebar .filter .filter-header .filter-name {
+  font-size: 0.9375rem;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   padding-right: 1rem;
 }
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .filter .filter-header .filter-name:hover,
-.reportbuilder-wrapper .reportbuilder-conditions-list .filter .filter-header .filter-name:hover {
+.reportbuilder-filters-sidebar .filter .filter-header .filter-name:hover {
   white-space: normal;
   text-overflow: clip;
   word-break: break-all;
 }
 
-/**
-* Custom Reports.
-*/
-.reportbuilder-report-container {
+.reportbuilder-filters-wrapper .mform.full-width-labels .fdate_selector,
+.reportbuilder-conditions-list .mform.full-width-labels .fdate_selector {
+  flex-wrap: wrap;
+}
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group {
+  margin-bottom: 0;
+  max-width: 100%;
+}
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group:not(.row):last-child,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group:not(.row):last-child {
+  flex: 1;
   min-width: 0;
 }
-.reportbuilder-report-container button[data-action=toggle-edit-preview] .loading-icon {
-  margin-left: 0.5rem;
-}
-
-.reportbuilder-editor-table-container {
-  overflow-x: auto;
-}
-
-/* Custom table headers */
-.reportbuilder-table th button[data-action=report-remove-column] .icon,
-.reportbuilder-table th span[data-drag-type=move] .icon {
-  width: 12px;
-  height: 12px;
-  font-size: 12px;
-  vertical-align: text-top;
-  color: #1d2125;
-}
-.reportbuilder-table th button[data-action=report-remove-column] .icon {
-  margin-right: 0;
-}
-
-/* Sidebar menu */
-@media (min-width: 992px) {
-  .reportbuilder-sidebar-menu {
-    width: 250px;
-    flex-shrink: 0;
-  }
-}
-.reportbuilder-sidebar-menu .card-body .list-group-item {
-  padding: 0.75rem;
-}
-.reportbuilder-sidebar-menu .card-body .list-group-item .icon {
-  width: 12px;
-  height: 12px;
-  font-size: 12px;
-}
-
-.reportbuilder-sidebar-menu-cards {
-  overflow-y: auto;
-  scrollbar-width: thin;
-  scrollbar-color: #6a737b #f8f9fa;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar {
-  width: 12px;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-track {
-  background: #f8f9fa;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb {
-  background-color: #6a737b;
-  border-radius: 20px;
-  border: 3px solid #f8f9fa;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb:hover {
-  background-color: #495057;
-}
-
-/* Settings sidebar */
-.reportbuilder-sidebar-settings {
-  overflow-y: auto;
-  scrollbar-width: thin;
-  scrollbar-color: #6a737b #f8f9fa;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar {
-  width: 12px;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar-track {
-  background: #f8f9fa;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb {
-  background-color: #6a737b;
-  border-radius: 20px;
-  border: 3px solid #f8f9fa;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb:hover {
-  background-color: #495057;
-}
-@media (min-width: 992px) {
-  .reportbuilder-sidebar-settings {
-    width: 350px;
-    flex-shrink: 0;
-  }
-}
-.reportbuilder-sidebar-settings .list-group-item {
-  padding: 0.75rem;
-}
-.reportbuilder-sidebar-settings .list-group-item .icon {
-  width: 12px;
-  height: 12px;
-  font-size: 12px;
-  color: #1d2125;
-}
-.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-filter] .icon,
-.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-condition] .icon {
-  margin-right: 0;
-  vertical-align: text-top;
-}
-.reportbuilder-sidebar-settings .list-group-item span[data-drag-type=move] .icon {
-  vertical-align: text-top;
-}
-.reportbuilder-sidebar-settings div[data-region=settings-sorting] .list-group-item span[data-drag-type=move] .icon {
-  vertical-align: middle;
-}
-.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-3,
-.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-9 {
-  flex: 1 1;
-  max-width: initial;
-}
-.reportbuilder-sidebar-settings div[data-region=settings-cardview] form div[data-fieldtype=submit] {
-  flex-basis: auto;
-}
-.reportbuilder-sidebar-settings .inplaceeditable.inplaceeditingon input {
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group:not(.row):last-child span,
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group:not(.row):last-child .custom-select,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group:not(.row):last-child span,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group:not(.row):last-child .custom-select {
   width: 100%;
 }
 
-/* Add button styles when a toggle button is active. */
-.reportbuilder-wrapper button.btn-outline-secondary[data-toggle=collapse]:not(.collapsed),
-.reportbuilder-wrapper .dropdown.show button.btn-outline-secondary[data-toggle=dropdown] {
-  color: #fff;
-  background-color: #6a737b;
-  border-color: #6a737b;
-}
-
-/* Drag&drop styles. */
-.reportbuilder-sortable-list li.sortable-list-current-position,
-.reportbuilder-table th.sortable-list-current-position,
-.reportbuilder-conditions-list .condition.sortable-list-current-position {
-  background-color: #a2cff8;
-}
-.reportbuilder-sortable-list li.sortable-list-is-dragged,
-.reportbuilder-table th.sortable-list-is-dragged,
-.reportbuilder-conditions-list .condition.sortable-list-is-dragged {
-  background-color: #fff;
-  opacity: 0.85;
-}
-
-/* Reportbuilder full page styles. */
 @media (min-width: 992px) {
   .path-admin-reportbuilder.pagelayout-popup.behat-site .fixed-top {
     position: fixed;
@@ -38048,7 +37909,133 @@ div.editor_atto_toolbar button .icon {
   overflow-y: auto;
 }
 
-/* Toggle cards. */
+.reportbuilder-report-container {
+  min-width: 0;
+}
+.reportbuilder-report-container button[data-action=toggle-edit-preview] .loading-icon {
+  margin-left: 0.5rem;
+}
+
+.reportbuilder-editor-table-container {
+  overflow-x: auto;
+}
+
+.reportbuilder-table th button[data-action=report-remove-column] .icon,
+.reportbuilder-table th span[data-drag-type=move] .icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+  vertical-align: text-top;
+  color: #1d2125;
+}
+.reportbuilder-table th button[data-action=report-remove-column] .icon {
+  margin-right: 0;
+}
+
+@media (min-width: 992px) {
+  .reportbuilder-sidebar-menu {
+    width: 250px;
+    flex-shrink: 0;
+  }
+}
+.reportbuilder-sidebar-menu .card-body .list-group-item {
+  padding: 0.75rem;
+}
+.reportbuilder-sidebar-menu .card-body .list-group-item .icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
+
+.reportbuilder-sidebar-menu-cards {
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: #6a737b #f8f9fa;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar {
+  width: 12px;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-track {
+  background: #f8f9fa;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb {
+  background-color: #6a737b;
+  border-radius: 20px;
+  border: 3px solid #f8f9fa;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb:hover {
+  background-color: #495057;
+}
+
+.reportbuilder-sidebar-settings {
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: #6a737b #f8f9fa;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar {
+  width: 12px;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar-track {
+  background: #f8f9fa;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb {
+  background-color: #6a737b;
+  border-radius: 20px;
+  border: 3px solid #f8f9fa;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb:hover {
+  background-color: #495057;
+}
+@media (min-width: 992px) {
+  .reportbuilder-sidebar-settings {
+    width: 350px;
+    flex-shrink: 0;
+  }
+}
+.reportbuilder-sidebar-settings .list-group-item {
+  padding: 0.75rem;
+}
+.reportbuilder-sidebar-settings .list-group-item .icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+  color: #1d2125;
+}
+.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-filter] .icon,
+.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-condition] .icon {
+  margin-right: 0;
+  vertical-align: text-top;
+}
+.reportbuilder-sidebar-settings .list-group-item span[data-drag-type=move] .icon {
+  vertical-align: text-top;
+}
+.reportbuilder-sidebar-settings div[data-region=settings-sorting] .list-group-item span[data-drag-type=move] .icon {
+  vertical-align: middle;
+}
+.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-3,
+.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-9 {
+  flex: 1 1;
+  max-width: initial;
+}
+.reportbuilder-sidebar-settings div[data-region=settings-cardview] form div[data-fieldtype=submit] {
+  flex-basis: auto;
+}
+.reportbuilder-sidebar-settings .inplaceeditable.inplaceeditingon input {
+  width: 100%;
+}
+
+.reportbuilder-sortable-list li.sortable-list-current-position,
+.reportbuilder-table th.sortable-list-current-position,
+.reportbuilder-conditions-list .condition.sortable-list-current-position {
+  background-color: #a2cff8;
+}
+.reportbuilder-sortable-list li.sortable-list-is-dragged,
+.reportbuilder-table th.sortable-list-is-dragged,
+.reportbuilder-conditions-list .condition.sortable-list-is-dragged {
+  background-color: #fff;
+  opacity: 0.85;
+}
+
 .reportbuilder-toggle-card .card-header {
   border-bottom: none;
 }
@@ -38073,11 +38060,6 @@ div.editor_atto_toolbar button .icon {
   display: none;
 }
 
-/* Audiences. */
-.reportbuilder-audiences-container {
-  /* 'OR' separator. */
-  /* Card action icons. */
-}
 .reportbuilder-audiences-container .audience-separator {
   text-transform: uppercase;
 }
@@ -38096,7 +38078,6 @@ div.editor_atto_toolbar button .icon {
   margin-right: 0;
 }
 
-/* Report table card view styles */
 @media (max-width: 575.98px) {
   .reportbuilder-report[data-report-type="0"]:not([data-editing]):not([data-force-table]) table.reportbuilder-table thead {
     display: none;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index e4c166167f8..1c52fdf8909 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -37698,14 +37698,19 @@ div.editor_atto_toolbar button .icon {
 }
 
 /**
-* Reportbuilder.
+* Reportbuilder styles.
 */
-/* Table */
+.reportbuilder-wrapper .btn-outline-secondary[data-toggle=collapse]:not(.collapsed),
+.reportbuilder-wrapper .dropdown.show .btn-outline-secondary[data-toggle=dropdown] {
+  color: #fff;
+  background-color: #6a737b;
+  border-color: #6a737b;
+}
+
 .reportbuilder-table .action-menu .menubar {
   justify-content: end;
 }
 
-/* Filters */
 .reportbuilder-wrapper .filters-dropdown {
   width: 27rem;
   padding: 0;
@@ -37717,208 +37722,64 @@ div.editor_atto_toolbar button .icon {
     width: 100%;
   }
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar {
+
+.reportbuilder-filters-sidebar {
   max-height: calc(100vh - 50px - 1rem);
   overflow-y: auto;
   scrollbar-width: thin;
   scrollbar-color: #6a737b #fff;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar {
+.reportbuilder-filters-sidebar::-webkit-scrollbar {
   width: 12px;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar-track {
+.reportbuilder-filters-sidebar::-webkit-scrollbar-track {
   background: #fff;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar-thumb {
+.reportbuilder-filters-sidebar::-webkit-scrollbar-thumb {
   background-color: #6a737b;
   border-radius: 20px;
   border: 3px solid #fff;
 }
-.reportbuilder-wrapper .filters-dropdown .reportbuilder-filters-sidebar::-webkit-scrollbar-thumb:hover {
+.reportbuilder-filters-sidebar::-webkit-scrollbar-thumb:hover {
   background-color: #495057;
 }
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform.full-width-labels .fitem.row > .col-md-3,
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform.full-width-labels .fitem.row > .col-md-9,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform.full-width-labels .fitem.row > .col-md-3,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform.full-width-labels .fitem.row > .col-md-9 {
-  flex: 0 0 100%;
-  max-width: 100%;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform.full-width-labels .fitem.row .fdate_selector,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform.full-width-labels .fitem.row .fdate_selector {
-  flex-wrap: wrap;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform .form-group,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform .form-group {
-  margin-bottom: 0;
-  max-width: 100%;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .mform .form-group > span,
-.reportbuilder-wrapper .reportbuilder-conditions-list .mform .form-group > span {
-  max-width: 100%;
-}
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .filter .filter-header,
-.reportbuilder-wrapper .reportbuilder-conditions-list .filter .filter-header {
+.reportbuilder-filters-sidebar .filter .filter-header {
   font-size: 1.171875rem;
 }
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .filter .filter-header .filter-name,
-.reportbuilder-wrapper .reportbuilder-conditions-list .filter .filter-header .filter-name {
-  font-size: 1rem;
+.reportbuilder-filters-sidebar .filter .filter-header .filter-name {
+  font-size: 0.9375rem;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   padding-right: 1rem;
 }
-.reportbuilder-wrapper .reportbuilder-filters-wrapper .filter .filter-header .filter-name:hover,
-.reportbuilder-wrapper .reportbuilder-conditions-list .filter .filter-header .filter-name:hover {
+.reportbuilder-filters-sidebar .filter .filter-header .filter-name:hover {
   white-space: normal;
   text-overflow: clip;
   word-break: break-all;
 }
 
-/**
-* Custom Reports.
-*/
-.reportbuilder-report-container {
+.reportbuilder-filters-wrapper .mform.full-width-labels .fdate_selector,
+.reportbuilder-conditions-list .mform.full-width-labels .fdate_selector {
+  flex-wrap: wrap;
+}
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group {
+  margin-bottom: 0;
+  max-width: 100%;
+}
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group:not(.row):last-child,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group:not(.row):last-child {
+  flex: 1;
   min-width: 0;
 }
-.reportbuilder-report-container button[data-action=toggle-edit-preview] .loading-icon {
-  margin-left: 0.5rem;
-}
-
-.reportbuilder-editor-table-container {
-  overflow-x: auto;
-}
-
-/* Custom table headers */
-.reportbuilder-table th button[data-action=report-remove-column] .icon,
-.reportbuilder-table th span[data-drag-type=move] .icon {
-  width: 12px;
-  height: 12px;
-  font-size: 12px;
-  vertical-align: text-top;
-  color: #1d2125;
-}
-.reportbuilder-table th button[data-action=report-remove-column] .icon {
-  margin-right: 0;
-}
-
-/* Sidebar menu */
-@media (min-width: 992px) {
-  .reportbuilder-sidebar-menu {
-    width: 250px;
-    flex-shrink: 0;
-  }
-}
-.reportbuilder-sidebar-menu .card-body .list-group-item {
-  padding: 0.75rem;
-}
-.reportbuilder-sidebar-menu .card-body .list-group-item .icon {
-  width: 12px;
-  height: 12px;
-  font-size: 12px;
-}
-
-.reportbuilder-sidebar-menu-cards {
-  overflow-y: auto;
-  scrollbar-width: thin;
-  scrollbar-color: #6a737b #f8f9fa;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar {
-  width: 12px;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-track {
-  background: #f8f9fa;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb {
-  background-color: #6a737b;
-  border-radius: 20px;
-  border: 3px solid #f8f9fa;
-}
-.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb:hover {
-  background-color: #495057;
-}
-
-/* Settings sidebar */
-.reportbuilder-sidebar-settings {
-  overflow-y: auto;
-  scrollbar-width: thin;
-  scrollbar-color: #6a737b #f8f9fa;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar {
-  width: 12px;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar-track {
-  background: #f8f9fa;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb {
-  background-color: #6a737b;
-  border-radius: 20px;
-  border: 3px solid #f8f9fa;
-}
-.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb:hover {
-  background-color: #495057;
-}
-@media (min-width: 992px) {
-  .reportbuilder-sidebar-settings {
-    width: 350px;
-    flex-shrink: 0;
-  }
-}
-.reportbuilder-sidebar-settings .list-group-item {
-  padding: 0.75rem;
-}
-.reportbuilder-sidebar-settings .list-group-item .icon {
-  width: 12px;
-  height: 12px;
-  font-size: 12px;
-  color: #1d2125;
-}
-.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-filter] .icon,
-.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-condition] .icon {
-  margin-right: 0;
-  vertical-align: text-top;
-}
-.reportbuilder-sidebar-settings .list-group-item span[data-drag-type=move] .icon {
-  vertical-align: text-top;
-}
-.reportbuilder-sidebar-settings div[data-region=settings-sorting] .list-group-item span[data-drag-type=move] .icon {
-  vertical-align: middle;
-}
-.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-3,
-.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-9 {
-  flex: 1 1;
-  max-width: initial;
-}
-.reportbuilder-sidebar-settings div[data-region=settings-cardview] form div[data-fieldtype=submit] {
-  flex-basis: auto;
-}
-.reportbuilder-sidebar-settings .inplaceeditable.inplaceeditingon input {
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group:not(.row):last-child span,
+.reportbuilder-filters-wrapper .mform.full-width-labels .form-group:not(.row):last-child .custom-select,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group:not(.row):last-child span,
+.reportbuilder-conditions-list .mform.full-width-labels .form-group:not(.row):last-child .custom-select {
   width: 100%;
 }
 
-/* Add button styles when a toggle button is active. */
-.reportbuilder-wrapper button.btn-outline-secondary[data-toggle=collapse]:not(.collapsed),
-.reportbuilder-wrapper .dropdown.show button.btn-outline-secondary[data-toggle=dropdown] {
-  color: #fff;
-  background-color: #6a737b;
-  border-color: #6a737b;
-}
-
-/* Drag&drop styles. */
-.reportbuilder-sortable-list li.sortable-list-current-position,
-.reportbuilder-table th.sortable-list-current-position,
-.reportbuilder-conditions-list .condition.sortable-list-current-position {
-  background-color: #a2cff8;
-}
-.reportbuilder-sortable-list li.sortable-list-is-dragged,
-.reportbuilder-table th.sortable-list-is-dragged,
-.reportbuilder-conditions-list .condition.sortable-list-is-dragged {
-  background-color: #fff;
-  opacity: 0.85;
-}
-
-/* Reportbuilder full page styles. */
 @media (min-width: 992px) {
   .path-admin-reportbuilder.pagelayout-popup.behat-site .fixed-top {
     position: fixed;
@@ -37982,7 +37843,133 @@ div.editor_atto_toolbar button .icon {
   overflow-y: auto;
 }
 
-/* Toggle cards. */
+.reportbuilder-report-container {
+  min-width: 0;
+}
+.reportbuilder-report-container button[data-action=toggle-edit-preview] .loading-icon {
+  margin-left: 0.5rem;
+}
+
+.reportbuilder-editor-table-container {
+  overflow-x: auto;
+}
+
+.reportbuilder-table th button[data-action=report-remove-column] .icon,
+.reportbuilder-table th span[data-drag-type=move] .icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+  vertical-align: text-top;
+  color: #1d2125;
+}
+.reportbuilder-table th button[data-action=report-remove-column] .icon {
+  margin-right: 0;
+}
+
+@media (min-width: 992px) {
+  .reportbuilder-sidebar-menu {
+    width: 250px;
+    flex-shrink: 0;
+  }
+}
+.reportbuilder-sidebar-menu .card-body .list-group-item {
+  padding: 0.75rem;
+}
+.reportbuilder-sidebar-menu .card-body .list-group-item .icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
+
+.reportbuilder-sidebar-menu-cards {
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: #6a737b #f8f9fa;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar {
+  width: 12px;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-track {
+  background: #f8f9fa;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb {
+  background-color: #6a737b;
+  border-radius: 20px;
+  border: 3px solid #f8f9fa;
+}
+.reportbuilder-sidebar-menu-cards::-webkit-scrollbar-thumb:hover {
+  background-color: #495057;
+}
+
+.reportbuilder-sidebar-settings {
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: #6a737b #f8f9fa;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar {
+  width: 12px;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar-track {
+  background: #f8f9fa;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb {
+  background-color: #6a737b;
+  border-radius: 20px;
+  border: 3px solid #f8f9fa;
+}
+.reportbuilder-sidebar-settings::-webkit-scrollbar-thumb:hover {
+  background-color: #495057;
+}
+@media (min-width: 992px) {
+  .reportbuilder-sidebar-settings {
+    width: 350px;
+    flex-shrink: 0;
+  }
+}
+.reportbuilder-sidebar-settings .list-group-item {
+  padding: 0.75rem;
+}
+.reportbuilder-sidebar-settings .list-group-item .icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+  color: #1d2125;
+}
+.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-filter] .icon,
+.reportbuilder-sidebar-settings .list-group-item button[data-action=report-remove-condition] .icon {
+  margin-right: 0;
+  vertical-align: text-top;
+}
+.reportbuilder-sidebar-settings .list-group-item span[data-drag-type=move] .icon {
+  vertical-align: text-top;
+}
+.reportbuilder-sidebar-settings div[data-region=settings-sorting] .list-group-item span[data-drag-type=move] .icon {
+  vertical-align: middle;
+}
+.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-3,
+.reportbuilder-sidebar-settings div[data-region=settings-cardview] form .col-md-9 {
+  flex: 1 1;
+  max-width: initial;
+}
+.reportbuilder-sidebar-settings div[data-region=settings-cardview] form div[data-fieldtype=submit] {
+  flex-basis: auto;
+}
+.reportbuilder-sidebar-settings .inplaceeditable.inplaceeditingon input {
+  width: 100%;
+}
+
+.reportbuilder-sortable-list li.sortable-list-current-position,
+.reportbuilder-table th.sortable-list-current-position,
+.reportbuilder-conditions-list .condition.sortable-list-current-position {
+  background-color: #a2cff8;
+}
+.reportbuilder-sortable-list li.sortable-list-is-dragged,
+.reportbuilder-table th.sortable-list-is-dragged,
+.reportbuilder-conditions-list .condition.sortable-list-is-dragged {
+  background-color: #fff;
+  opacity: 0.85;
+}
+
 .reportbuilder-toggle-card .card-header {
   border-bottom: none;
 }
@@ -38007,11 +37994,6 @@ div.editor_atto_toolbar button .icon {
   display: none;
 }
 
-/* Audiences. */
-.reportbuilder-audiences-container {
-  /* 'OR' separator. */
-  /* Card action icons. */
-}
 .reportbuilder-audiences-container .audience-separator {
   text-transform: uppercase;
 }
@@ -38030,7 +38012,6 @@ div.editor_atto_toolbar button .icon {
   margin-right: 0;
 }
 
-/* Report table card view styles */
 @media (max-width: 575.98px) {
   .reportbuilder-report[data-report-type="0"]:not([data-editing]):not([data-force-table]) table.reportbuilder-table thead {
     display: none;