diff --git a/themes/bootprint3/scss/bootprint.scss b/themes/bootprint3/scss/bootprint.scss
index d223f762334e23546f33c9fa97ad515e69de3e0e..ccfd41b35ea68282cb4024025ba017b741d54540 100644
--- a/themes/bootprint3/scss/bootprint.scss
+++ b/themes/bootprint3/scss/bootprint.scss
@@ -129,19 +129,25 @@ ul.random.image li img { margin: 0 auto; }
 
 /* --- Sidebar --- */
 .sidebar {
-  .list-group { margin-bottom: 5px; }
-  .list-group label.list-group-item { padding-left: 26px; }
-  .list-group label.list-group-item input[type=checkbox] { margin-top: 2px; }
+  .facet-group { margin-bottom: 5px; }
+  .facet-group label.list-group-item { padding-left: 26px; }
+  .facet-group label.list-group-item input[type=checkbox] { margin-top: 2px; }
 
-  .list-group-item { padding: 7px 10px 6px; }
-  .list-group-item.active { color: #fff; }
-  .list-group-item.active .badge { color: $active-orange; }
-  .list-group-item.active,
-  .list-group-item.active:hover {
-    background: $active-orange;
+  .facet { padding: 7px 10px 6px; }
+  .facet.active,
+  .facet.active:hover,
+  .active-filters .facet {
+    color: #fff;
+    background-color: $active-orange;
     border-color: $active-orange;
   }
-  .list-group-item .badge a { color: #fff; }
+  .facet.active .badge,
+  .jstree-node.active .badge,
+  .jstree-node.active .badge .fa { color: $active-orange; }
+  .facet .badge a { color: #fff; }
+
+  .facet.facetOR { padding-left: 1rem; }
+  .facet.excludable { padding-right: 0; }
 }
 .slider-container .slider-handle {
   background: $brand-primary;
@@ -156,3 +162,5 @@ ul.random.image li img { margin: 0 auto; }
   color: #fff;
   &:hover { color: $brand-danger; }
 }
+.jstree-facet .jstree-ocl::before { margin-left: -5px; }
+.jstree-node.active { background-color: $active-orange; }
diff --git a/themes/bootstrap3/scss/components/js-tree.scss b/themes/bootstrap3/scss/components/js-tree.scss
index 1e81d6bcd866fb4d342661d3e94366c419878c13..3a0c314052aa6b51be60d2ed790726e0ea876b04 100644
--- a/themes/bootstrap3/scss/components/js-tree.scss
+++ b/themes/bootstrap3/scss/components/js-tree.scss
@@ -1,4 +1,5 @@
-.hierarchy-tree {
+.hierarchy-tree,
+.jstree-facet {
   /* jsTree arrows */
   .jstree-ocl:before {
     float: left;
@@ -20,7 +21,7 @@
     color: #000;
   }
   .jstree-anchor {
-    padding: 2px 5px;
+    padding-left: 5px;
     white-space: nowrap;
   }
   .jstree-container-ul,
@@ -41,6 +42,12 @@
     font-weight: bold;
   }
 }
+.jstree-node.list-group-item {
+  margin-bottom: 0;
+  border: 0;
+  border-bottom: 1px solid $list-group-border;
+  border-radius: 0;
+}
 
 /* --- Record --- */
 #hierarchyTreeHolder {
@@ -73,12 +80,14 @@
 }
 /* facet list styling */
 .jstree-facet li span.main {
-  display: block;
-  padding-left: 1px; /* Fix Firefox cutting the checkboxes */
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.jstree-facet .main.applied .fa-check {
+  margin-top: 2px;
+  margin-right: 4px;
+}
 .jstree-facet .jstree-container-ul {
   padding: 0;
   & > li.active,
@@ -92,6 +101,6 @@ li.jstree-node { list-style: none; }
 li.jstree-facet .badge { cursor: text; }
 li.jstree-facet ul { padding-left: 20px; }
 
-.list-group.facet .jstree-node.list-group-item { padding-left: 19px; }
-.list-group.facet .jstree-icon::before { margin-left: -12px; }
-.list-group.facet .jstree-facet li span.main { padding: 1px; }
+.facet .jstree-node.list-group-item { padding-left: 19px; }
+.facet .jstree-icon::before { margin-left: -12px; }
+.facet .jstree-facet li span.main { padding: 1px; }
diff --git a/themes/bootstrap3/scss/components/sidebar.scss b/themes/bootstrap3/scss/components/sidebar.scss
index 851f55db2c60c0695c0a661fdbda04e9ba2c90d5..6f550f08f72d99371ff139c2dd3dca9a58d92576 100644
--- a/themes/bootstrap3/scss/components/sidebar.scss
+++ b/themes/bootstrap3/scss/components/sidebar.scss
@@ -9,7 +9,11 @@
     line-height: 1.5rem;
 
     .badge,
-    .status { float: right; }
+    .status {
+      float: right;
+
+      body.rtl & { float: left; }
+    }
     .badge {
       max-height: 19px;
       line-height: 1.1rem;
@@ -74,16 +78,23 @@
   font-weight: bold;
   color: $text-color;
 }
+.facet-group > .checkbox,
+.sidebar .facet.checkbox {
+  margin: 0;
+  padding-left: 2rem;
+}
 
 .active-filters .facet,
 .facet-group .active {
+  padding-right: .65rem;
   background-color: $brand-primary;
   color: #fff;
 
   a { color: #fff; }
 }
-.active-filters .facet { padding-right: .65rem; }
-.facet-group .active .badge {
+.facet.active .badge,
+.jstree-node.active .badge,
+.jstree-node.active .badge .fa {
   background-color: #fff;
   color: $brand-primary;
 }
@@ -105,3 +116,10 @@
 }
 
 .full-facet-list { margin-top: 1rem; }
+.full-facet-list .active .fa {
+  float: right;
+  margin-top: .25rem;
+  margin-right: 0.5rem;
+  margin-left: 0.5rem;
+}
+body.rtl .full-facet-list .active .fa { float: left; }