diff --git a/reportbuilder/templates/local/sidebar-menu/area.mustache b/reportbuilder/templates/local/sidebar-menu/area.mustache
index 3c47c2f15c6..6eb9f58ac84 100644
--- a/reportbuilder/templates/local/sidebar-menu/area.mustache
+++ b/reportbuilder/templates/local/sidebar-menu/area.mustache
@@ -39,7 +39,7 @@
         </label>
         <input id="reportbuilder-sidebar-search"
                type="text"
-               class="form-control  border-right-0"
+               class="form-control rounded-left border-right-0"
                placeholder="{{#str}} search, core_search {{/str}}"
                aria-label="{{#str}} search, core_search {{/str}}"
                data-action="sidebar-search">
diff --git a/reportbuilder/templates/local/sidebar-menu/card_item.mustache b/reportbuilder/templates/local/sidebar-menu/card_item.mustache
index 16b00eb0bb2..bd8b2da7c9e 100644
--- a/reportbuilder/templates/local/sidebar-menu/card_item.mustache
+++ b/reportbuilder/templates/local/sidebar-menu/card_item.mustache
@@ -29,7 +29,7 @@
     <a href="#"
        title="{{title}}"
        role="button"
-       class="list-group-item list-group-item-action d-flex align-items-start justify-content-between pr-2"
+       class="list-group-item list-group-item-action d-flex align-items-start justify-content-between pr-2 bg-transparent"
        data-action="{{action}}"
        data-unique-identifier="{{identifier}}"
        data-name="{{name}}">
@@ -41,7 +41,7 @@
 {{/disabled}}
 {{#disabled}}
     <div title="{{title}}"
-          class="list-group-item list-group-item-action d-flex align-items-start justify-content-between pr-2 text-muted" >
+          class="list-group-item list-group-item-action d-flex align-items-start justify-content-between pr-2 bg-transparent text-muted" >
             {{{name}}}
         <span class="ml-auto ml-1 ">
             {{#pix}} i/info, core {{/pix}}
diff --git a/reportbuilder/templates/toggle_card.mustache b/reportbuilder/templates/toggle_card.mustache
index 36620127c23..a51619a89f2 100644
--- a/reportbuilder/templates/toggle_card.mustache
+++ b/reportbuilder/templates/toggle_card.mustache
@@ -30,11 +30,11 @@
 }}
 <div class="card reportbuilder-toggle-card mb-2">
     <div class="card-header p-0">
-        <div class="d-flex align-items-center bg-light mb-0 p-1">
+        <div class="d-flex align-items-center mb-0 p-1">
             <div class="ml-3">
                 <span class="mr-1">{{$header}}{{/header}}</span> {{$helpicon}}{{/helpicon}}
             </div>
-            <button class="btn toggle-card-button nomargin ml-auto {{$collapsed}}{{/collapsed}}"
+            <button class="btn toggle-card-button ml-auto {{$collapsed}}{{/collapsed}}"
                     data-toggle="collapse"
                     data-target="#{{$id}}{{uniqid}}{{/id}}"
                     aria-expanded="true"