diff --git a/src/SearchBlock/less/answersbox.less b/src/SearchBlock/less/answersbox.less
index 746dbba71..1f3251134 100644
--- a/src/SearchBlock/less/answersbox.less
+++ b/src/SearchBlock/less/answersbox.less
@@ -9,7 +9,7 @@
 
   .buttons {
     .button {
-      background-color: @sf-azure !important;
+      background-color: @secondaryColor !important;
     }
 
     .button:first-child {
@@ -63,7 +63,7 @@
     //     width: 0px;
     //     height: 10px;
     //     animation: progres 4s infinite ease-out;
-    //     background-color: @sf-azure;
+    //     background-color: @secondaryColor;
     //     border-radius: 1px;
     //   }
     // }
diff --git a/src/SearchBlock/less/facets.less b/src/SearchBlock/less/facets.less
index bdeb13ec1..348ebe86b 100644
--- a/src/SearchBlock/less/facets.less
+++ b/src/SearchBlock/less/facets.less
@@ -18,7 +18,7 @@ div#page-document .searchlib-block {
   div.boolean-facet {
     div.toggle {
       label {
-        color: @s-dark-gray !important;
+        color: @deepBlue !important;
 
         &:before {
           box-shadow: 0px 0px 0px 2px @sf-medium-gray2 !important;
@@ -32,8 +32,8 @@ div#page-document .searchlib-block {
       &.checked {
         label {
           &:before {
-            background-color: @sf-azure !important;
-            box-shadow: 0px 0px 0px 2px @sf-azure !important;
+            background-color: @secondaryColor !important;
+            box-shadow: 0px 0px 0px 2px @secondaryColor !important;
           }
         }
       }
@@ -56,21 +56,11 @@ div#page-document .searchlib-block {
     }
   }
 
-  div.content-section-tabs.menu {
-    overflow: auto;
-    width: 100%;
-    max-width: 100%;
-    border: none;
-    border-top: none;
-    border-right: none;
-    border-bottom: 1px solid @sf-light-gray2;
-    border-left: none;
-    margin: 0;
-    margin-bottom: 3px;
-    border-radius: 0px;
-    box-shadow: none;
+  .content-section-tabs.menu {
+    margin-bottom: 1em;
+    overflow-x: auto;
 
-    div.item.dropdown {
+    .item.dropdown {
       padding: 0px 10px 0px 10px;
       border: none;
       border-bottom: 4px solid white;
@@ -104,12 +94,12 @@ div#page-document .searchlib-block {
     }
 
     a.item {
-      padding: 0px;
-      border-bottom: 4px solid white;
-      margin-right: 3em;
-      border-radius: 0px;
-      color: @sf-dark-gray;
-      font-size: 14px;
+      // padding: 0px;
+      // border-bottom: 3px solid white;
+      // margin-right: 1.5em;
+      // border-radius: 0px;
+      color: @deepBlue;
+      font-size: 18px;
 
       &:hover {
         background: white;
@@ -120,21 +110,22 @@ div#page-document .searchlib-block {
       }
 
       &.active {
-        border-bottom: 4px solid @sf-azure;
+        // border-bottom: 3px solid @secondaryColor;
+        color: @secondaryColor;
 
-        .icon {
-          color: @sf-azure !important;
-        }
+        // .icon {
+        //   color: @secondaryColor !important;
+        // }
       }
 
       span.title {
         margin-right: 5px;
       }
 
-      span.count {
-        color: @sf-medium-gray2;
-        font-weight: 400;
-      }
+      // span.count {
+      //   color: @sf-medium-gray2;
+      //   font-weight: 400;
+      // }
     }
   }
 
@@ -331,7 +322,7 @@ div#page-document .searchlib-block {
     margin-right: 0px;
     background: @sf-light-gray !important;
     border-radius: 2px;
-    color: @sf-azure !important;
+    color: @secondaryColor !important;
     float: right;
     font-size: 12px;
   }
@@ -358,69 +349,6 @@ div#page-document .searchlib-block {
     }
   }
 
-  .filter-list-item.more-like-this {
-    margin-bottom: 1em;
-
-    div.ui.label {
-      width: 100%;
-    }
-
-    i.icon.delete {
-      position: absolute;
-      top: 10px;
-      right: 10px;
-      color: @sf-azure;
-    }
-
-    div.meta {
-      line-height: normal;
-
-      i.icon {
-        margin-right: 0.5em;
-      }
-    }
-
-    a.centered {
-      img {
-        width: 100%;
-        height: auto;
-        max-height: 200px;
-        margin-top: 0.5em;
-        margin-bottom: 0.5em;
-        object-fit: cover;
-        object-position: top;
-      }
-    }
-
-    h4 {
-      margin-top: 0.5em;
-      line-height: inherit;
-    }
-  }
-
-  .filter-list-item.more-like-this > .labels > .label {
-    overflow: hidden;
-    max-width: 100%;
-    padding: 0px;
-    margin: 0px;
-  }
-
-  .mlt-filter {
-    img {
-      width: 100%;
-      height: auto;
-    }
-
-    a {
-      font-size: 12px;
-    }
-
-    .meta {
-      font-size: 12px;
-      font-weight: 400;
-    }
-  }
-
   .card .meta {
     color: @s-medium-gray2 !important;
   }
@@ -459,7 +387,7 @@ div#page-document .searchlib-block {
           button {
             padding: 3px;
             background: @sf-light-gray !important;
-            color: @sf-azure;
+            color: @secondaryColor;
             float: right;
             font-size: 10px;
           }
@@ -489,7 +417,7 @@ div#page-document .searchlib-block {
       div.label {
         max-width: 100%;
         background: @sf-light-gray !important;
-        color: @sf-azure;
+        color: @secondaryColor;
         font-weight: 600;
 
         span.text {
@@ -505,8 +433,8 @@ div#page-document .searchlib-block {
   }
 }
 
-div.ui.modal.facet {
-  background: @sf-light-gray;
+.ui.modal.facet {
+  // background: @sf-light-gray;
 
   img.facet-option-icon {
     display: inline;
@@ -516,29 +444,24 @@ div.ui.modal.facet {
     filter: grayscale(100%);
   }
 
-  div.content .searchlib-multiterm-facet.facet-sources {
+  > .header {
+    padding: 1em 1.5em;
+  }
+
+  .content {
+    padding: 2em;
+  }
+
+  .content .searchlib-multiterm-facet.facet-sources {
     img.facet-option-icon {
+      display: block;
       height: 28px;
-      margin-top: -10px;
-      margin-bottom: -10px;
-      margin-left: -5px;
       background: white;
       -webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */
       filter: grayscale(100%);
     }
   }
 
-  div.content .searchlib-multiterm-facet.facet-content-types {
-    i.icon {
-      position: relative;
-      top: 0.22em;
-      margin-top: -5px;
-      margin-right: 3px;
-      margin-bottom: -5px;
-      font-size: 2em;
-    }
-  }
-
   fieldset.sui-facet.searchlib-fixedrange-facet {
     padding: 20px;
 
@@ -569,6 +492,7 @@ div.ui.modal.facet {
       display: flex;
       align-items: center;
       margin-top: 1.5em;
+      margin-bottom: 1em;
       --text-divider-gap: 0.5em;
     }
 
@@ -593,11 +517,11 @@ div.ui.modal.facet {
   }
 
   div.header {
-    border: none;
+    border-bottom: 1px solid @midGray;
     background-color: initial;
 
     .facet-title {
-      margin-bottom: 1em;
+      color: @lightBlack;
 
       h3 {
         font-size: calc(10px + 4 * ((100vw - 320px) / 680));
@@ -613,20 +537,20 @@ div.ui.modal.facet {
     }
 
     div.multitermlist__facet__header {
-      .search-wrapper {
-        display: flex;
-        align-items: center;
-      }
+      // .search-wrapper {
+      //   display: flex;
+      //   align-items: center;
+      // }
 
       div.search {
         display: flex;
         // width: 100%;
         align-items: center;
-        margin-right: 0px;
+        margin-top: 1em;
       }
 
       input.multitermlist__search__text-input {
-        width: 100%;
+        width: 40%;
         padding: 0.2em;
         border: 1px solid @sf-medium-gray;
         margin-right: 1em;
@@ -639,6 +563,12 @@ div.ui.modal.facet {
         }
       }
 
+      span.label {
+        color: @deepBlue;
+        font-size: 16px;
+        font-weight: 400;
+      }
+
       div.order-controls {
         display: flex;
         flex-wrap: wrap;
@@ -646,10 +576,6 @@ div.ui.modal.facet {
         justify-content: space-between;
         margin-left: auto;
 
-        span.label {
-          font-size: 14px;
-        }
-
         div.toggle-label {
           cursor: pointer;
         }
@@ -658,25 +584,27 @@ div.ui.modal.facet {
           padding-left: 0.3em;
 
           div.toggle-label {
-            padding: 0.3em 0.7em 0.3em 0.7em;
+            margin-left: 10px;
             background: white;
             border-radius: 8px;
-            color: @sf-dark-gray;
-            font-size: 14px;
+            color: @deepBlue;
+            font-size: 16px;
+            font-weight: 400;
 
             i.icon {
               margin-left: 3px;
             }
 
             &.active {
-              color: @sf-azure;
+              color: @secondaryColor;
+              font-weight: 700;
             }
           }
         }
       }
 
       div.ui.toggle.checkbox {
-        padding-right: 0.5em;
+        padding-left: 0.5em;
         color: @sf-dark-gray !important;
         font-size: 14px;
 
@@ -687,10 +615,10 @@ div.ui.modal.facet {
           &:before {
             position: absolute;
             top: 5px;
-            width: 2rem;
+            width: 1.6rem;
             height: 0.8rem !important;
-            background: @sf-medium-gray2 !important;
-            box-shadow: 0px 0px 0px 2px @sf-medium-gray2 !important;
+            background: #bdbdbd !important;
+            box-shadow: 0px 0px 0px 2px #bdbdbd !important;
           }
 
           &:after {
@@ -705,8 +633,8 @@ div.ui.modal.facet {
         &.checked {
           label {
             &:before {
-              background-color: @sf-azure !important;
-              box-shadow: 0px 0px 0px 2px @sf-azure !important;
+              background-color: @secondaryColor !important;
+              box-shadow: 0px 0px 0px 2px @secondaryColor !important;
             }
 
             &:after {
@@ -718,61 +646,75 @@ div.ui.modal.facet {
     }
   }
 
-  button.term {
-    padding: 12px 10px 12px 10px;
-    border: 1px solid @sf-light-gray2;
-    margin: 5px;
-    background: white;
-    border-radius: 2px;
-    color: @sf-dark-gray;
-    font-size: 12px;
-    font-weight: 600;
+  .ui.card.term.active-term {
+    width: auto !important;
+    min-width: auto;
+    margin: 5px 1.5em 5px 0 !important;
 
-    span.title {
-      margin-right: 5px;
+    .header,
+    span.count {
+      color: @secondaryColor;
+      font-weight: 700;
     }
+  }
 
-    span.count {
-      color: @sf-medium-gray2;
-      font-size: 10px;
+  .ui.card.term {
+    min-width: 100px;
+    margin-top: 2em;
+
+    &.disabled {
+      .header,
+      span.count {
+        color: #bfbfbf;
+      }
+    }
+
+    .header {
+      border: none;
+      color: @deepBlue;
+      font-size: 16px;
       font-weight: 400;
     }
 
-    &.active {
-      border-color: @sf-medium-blue;
-      background: @sf-medium-blue !important;
-      box-shadow: none;
+    .content {
+      flex-grow: initial;
+      padding: 0;
+      padding-bottom: 0.5em;
+    }
 
+    &.active {
+      .header,
       span.count {
-        color: white;
+        color: @darkCerulean;
+        font-weight: 700;
       }
 
       &:hover {
-        background: @sf-medium-blue !important;
+        background: transparent !important;
       }
     }
 
     &:hover {
-      background: @sf-light-gray;
+      border: none;
+      background: transparent !important;
+      box-shadow: none;
     }
-  }
 
-  div.actions {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: baseline;
-    border: none;
-    text-align: left;
+    .title {
+      margin-right: 5px;
+    }
 
-    button {
-      padding: 12px 10px 12px 10px;
-      border-radius: 2px;
-      font-size: 12px;
+    .count {
+      color: @deepBlue;
+      font-size: 16px;
+      font-weight: 400;
     }
+  }
 
+  div.actions {
     a.clear-filters {
       margin-left: auto;
-      color: @sf-azure;
+      color: @secondaryColor;
       font-size: 12px;
     }
   }
@@ -784,13 +726,13 @@ div.ui.modal.facet {
   margin: 0;
 }
 
-@media screen and (min-width: 1000px) and (max-width: 1300px) {
-  div.content-section-tabs.menu {
-    a.item {
-      margin-right: 1.5em !important;
-    }
-  }
-}
+// @media screen and (min-width: 1000px) and (max-width: 1300px) {
+//   div.content-section-tabs.menu {
+//     a.item {
+//       margin-right: 1.5em !important;
+//     }
+//   }
+// }
 
 @media only screen and (max-width: 1080px) {
   div.facets {
@@ -811,27 +753,27 @@ div.ui.modal.facet {
   }
 }
 
-@media screen and (max-width: 1000px) {
-  div.content-section-tabs.menu {
-    a.item {
-      margin-right: 0.5em !important;
-
-      span.count {
-        font-size: 10px !important;
-      }
-    }
-  }
-}
-
-@media screen and (max-width: 600px) {
-  div.content-section-tabs.menu {
-    div.item.dropdown {
-      div.menu {
-        transform: translateX(-90px);
-      }
-    }
-  }
-}
+// @media screen and (max-width: 1000px) {
+//   div.content-section-tabs.menu {
+//     a.item {
+//       margin-right: 0.5em !important;
+//
+//       span.count {
+//         font-size: 10px !important;
+//       }
+//     }
+//   }
+// }
+//
+// @media screen and (max-width: 600px) {
+//   div.content-section-tabs.menu {
+//     div.item.dropdown {
+//       div.menu {
+//         transform: translateX(-90px);
+//       }
+//     }
+//   }
+// }
 
 @media only screen and (max-width: 766px) {
   div.content .searchlib-multiterm-facet.facet-sources button.ui.toggle {
diff --git a/src/SearchBlock/less/filterlist.less b/src/SearchBlock/less/filterlist.less
index 28ba69dff..d54ea6bc2 100644
--- a/src/SearchBlock/less/filterlist.less
+++ b/src/SearchBlock/less/filterlist.less
@@ -1,4 +1,8 @@
 div#page-document .searchlib-block {
+  .top-facetslist-wrapper {
+    margin: 1.5em 0 !important;
+  }
+
   .ui.inverted.segment.filter-list {
     padding: 0.4rem;
     background-color: #004b87;
@@ -48,7 +52,7 @@ div#page-document .searchlib-block {
       div.filter-list-header {
         padding-right: 0.5rem;
         padding-left: 0.5rem;
-        color: @sf-azure !important;
+        color: @secondaryColor !important;
         font-size: 14px;
 
         i.dropdown.icon {
@@ -67,7 +71,7 @@ div#page-document .searchlib-block {
           div.filter-name {
             position: relative;
             top: 3px;
-            color: @s-dark-gray;
+            color: @deepBlue;
             font-size: 14px;
           }
 
@@ -81,7 +85,7 @@ div#page-document .searchlib-block {
       }
 
       .ui.inverted.accordion .title:not(.ui) {
-        color: @s-dark-gray;
+        color: @deepBlue;
       }
 
       .ui.divider {
@@ -94,7 +98,7 @@ div#page-document .searchlib-block {
       }
 
       button.reset-filters {
-        color: @sf-azure !important;
+        color: @secondaryColor !important;
         font-size: 14px;
 
         i.icon {
@@ -114,7 +118,7 @@ div#page-document .searchlib-block {
     margin-right: 0px;
     background: @sf-light-gray !important;
     border-radius: 2px;
-    color: @sf-azure !important;
+    color: @secondaryColor !important;
     float: right;
     font-size: 12px;
   }
@@ -136,144 +140,260 @@ div#page-document .searchlib-block {
     }
   }
 
-  .filter-list-item.more-like-this {
-    margin-bottom: 1em;
+  // .filter-list-item.more-like-this {
+  //   margin-bottom: 1em;
+  //
+  //   div.ui.label {
+  //     width: 100%;
+  //   }
+  //
+  //   i.icon.delete {
+  //     position: absolute;
+  //     top: 10px;
+  //     right: 10px;
+  //     color: @secondaryColor;
+  //   }
+  //
+  //   div.meta {
+  //     line-height: normal;
+  //
+  //     i.icon {
+  //       margin-right: 0.5em;
+  //     }
+  //   }
+  //
+  //   a.centered {
+  //     img {
+  //       width: 100%;
+  //       height: auto;
+  //       max-height: 200px;
+  //       margin-top: 0.5em;
+  //       margin-bottom: 0.5em;
+  //       object-fit: cover;
+  //       object-position: top;
+  //     }
+  //   }
+  //
+  //   h4 {
+  //     margin-top: 0.5em;
+  //     line-height: inherit;
+  //   }
+  // }
+
+  // .filter-list-item.more-like-this > .labels > .label {
+  //   overflow: hidden;
+  //   max-width: 100%;
+  //   padding: 0px;
+  //   margin: 0px;
+  // }
+  //
+  // .mlt-filter {
+  //   img {
+  //     width: 100%;
+  //     height: auto;
+  //   }
+  //
+  //   a {
+  //     font-size: 12px;
+  //   }
+  //
+  //   .meta {
+  //     font-size: 12px;
+  //     font-weight: 400;
+  //   }
+  // }
 
-    div.ui.label {
-      width: 100%;
-    }
+  .card .meta {
+    color: @s-medium-gray2 !important;
+  }
+}
 
-    i.icon.delete {
-      position: absolute;
-      top: 10px;
-      right: 10px;
-      color: @sf-azure;
-    }
+.facets-wrapper {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  margin: 1em 0;
+}
 
-    div.meta {
-      line-height: normal;
+.ui.modal.filters-modal {
+  color: @lightBlack;
 
-      i.icon {
-        margin-right: 0.5em;
-      }
-    }
+  .header {
+    border-bottom: 1px solid @midGray;
+    color: @lightBlack;
+  }
 
-    a.centered {
-      img {
-        width: 100%;
-        height: auto;
-        max-height: 200px;
-        margin-top: 0.5em;
-        margin-bottom: 0.5em;
-        object-fit: cover;
-        object-position: top;
-      }
-    }
+  .modal-content-section {
+    margin-bottom: 2em;
+    font-size: 24px !important;
+  }
 
-    h4 {
-      margin-top: 0.5em;
-      line-height: inherit;
-    }
+  .filter-buttons {
+    display: flex;
+    flex-wrap: wrap;
   }
 
-  .filter-list-item.more-like-this > .labels > .label {
-    overflow: hidden;
-    max-width: 100%;
-    padding: 0px;
-    margin: 0px;
+  .ui.button.add-filter {
+    margin: 1em 2em 1em 0 !important;
+    background: #f9f9f9;
+    box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25);
+    color: @lightBlack;
+    font-weight: 700;
   }
+}
 
-  .mlt-filter {
-    img {
-      width: 100%;
-      height: auto;
-    }
+.modal-section-title {
+  // margin-bottom: 1em;
+  color: @lightBlack;
+  font-size: 20px;
+  font-weight: 700;
+}
+
+.facet-list-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 1.5em;
+
+  h4 {
+    margin: 0;
+  }
+}
+
+.ui.basic.button.clear-btn {
+  padding: 0.8em;
+  color: @secondaryColor !important;
+  font-size: 14px;
+  font-weight: 500;
+
+  &:hover {
+    border: none;
+    box-shadow: none;
+  }
+}
 
-    a {
+.ui.card.facet {
+  width: auto !important;
+  // min-width: 180px;
+  border: none !important;
+  margin: 5px 10px 5px 0 !important;
+  background: @midGray !important;
+  border-radius: 0 !important;
+  // margin: 3px 0px 3px 0px;
+  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25) !important;
+  color: @lightBlack !important;
+
+  .content {
+    padding: 0.5em 1em 0.5em;
+  }
+
+  .filter.description {
+    display: flex;
+
+    .ui.label {
+      padding: 5px;
+      margin-top: 4px;
+      margin-bottom: 0px;
+      background: @sf-blue;
+      color: white;
       font-size: 12px;
+
+      .text {
+        min-height: 13px !important;
+      }
     }
+  }
 
-    .meta {
-      font-size: 12px;
-      font-weight: 400;
+  &.active {
+    .label {
+      max-width: 100%;
+      color: @secondaryColor;
+      font-weight: 600;
+
+      .text {
+        display: block;
+        overflow: hidden;
+        max-width: calc(100% - 14px);
+        float: left;
+        text-overflow: hidden;
+        white-space: nowrap;
+      }
     }
   }
+}
 
-  .card .meta {
-    color: @s-medium-gray2 !important;
+.ui.card .card-header {
+  display: flex !important;
+  align-items: center;
+  padding: 0px !important;
+  margin: 0px !important;
+  color: @lightBlack;
+  font-size: 16px;
+  font-weight: 700;
+  text-align: center !important;
+
+  .text {
+    display: flex;
+    align-items: center;
   }
 
-  .facetslist-wrapper {
-    .card {
-      width: 100% !important;
-      border: 1px solid @sf-light-gray2;
-      margin: 3px 0px 3px 0px;
-      border-radius: 3px;
-      box-shadow: none;
+  .clear-filters {
+    position: relative;
+    width: 16px;
+    height: 16px;
+    padding: 3px;
+    border: 1px solid @lightBlack !important;
+    margin-left: 20px;
+    background: none !important;
+    border-radius: 2px;
+    box-shadow: none;
+    color: @lightBlack;
+    opacity: 1;
 
-      .content {
-        padding: 0.5em;
-
-        .header {
-          padding: 0px;
-          margin: 0px;
-          color: @sf-dark-gray;
-          font-size: 16px;
-          font-weight: 400;
-
-          .text {
-            display: block;
-            overflow: hidden;
-            max-width: calc(100% - 35px);
-            float: left;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
+    &:hover {
+      border: none;
+      box-shadow: none;
+      outline: none;
+    }
 
-          .clear-filters {
-            button {
-              padding: 3px;
-              background: @sf-light-gray !important;
-              color: @sf-azure;
-              float: right;
-              font-size: 10px;
-            }
-          }
-        }
+    i.close.icon {
+      position: absolute;
+      top: 3px;
+      left: -4px;
+      margin: 0 !important;
+      color: @lightBlack;
+      opacity: 1;
+
+      &:before,
+      &:after {
+        position: absolute;
+        top: 0;
+        left: 11px;
+        width: 1px;
+        height: 9px;
+        background-color: @lightBlack !important;
+        content: ' ';
       }
 
-      .filter.description {
-        display: flex;
-
-        .ui.label {
-          padding: 5px;
-          margin-top: 4px;
-          margin-bottom: 0px;
-          background: @sf-blue;
-          color: white;
-          font-size: 12px;
+      &:before {
+        transform: rotate(45deg);
+      }
 
-          .text {
-            min-height: 13px !important;
-          }
-        }
+      &:after {
+        transform: rotate(-45deg);
       }
+    }
+  }
+}
 
-      &.active {
-        .label {
-          max-width: 100%;
-          color: @sf-azure;
-          font-weight: 600;
-
-          .text {
-            display: block;
-            overflow: hidden;
-            max-width: calc(100% - 14px);
-            float: left;
-            text-overflow: hidden;
-            white-space: nowrap;
-          }
-        }
+.ui.card.active-term {
+  .clear-filters {
+    border: 1px solid @secondaryColor !important;
+
+    i.close.icon {
+      &:before,
+      &:after {
+        background-color: @secondaryColor !important;
       }
     }
   }
diff --git a/src/SearchBlock/less/landingpage.less b/src/SearchBlock/less/landingpage.less
index 104656084..394128ae7 100644
--- a/src/SearchBlock/less/landingpage.less
+++ b/src/SearchBlock/less/landingpage.less
@@ -1,255 +1,72 @@
-div#page-document .searchlib-block .landing-page-container {
-  background: @sf-light-gray;
+.landing-page-container {
+  margin-top: 5em;
 
-  .landing-page {
-    min-height: 500px;
-    padding: 50px;
-    margin: auto !important;
+  .search-tab-wrapper {
+    width: 100%;
+    overflow-x: auto;
+  }
 
-    div.twelve.wide {
-      padding-right: 0px;
-      padding-left: 0px;
-    }
+  .search-tab {
+    width: 1108px;
+    margin-top: 4em;
 
-    h3.browse-by {
-      font-weight: 700;
+    .ui.tab {
+      padding-right: 0;
+      padding-left: 0;
     }
 
-    div.filters {
-      margin-bottom: 2em;
-
-      button {
-        border: 1px solid @sf-medium-gray;
-        margin: 5px 14px 5px 0px;
-        background-color: white;
-        border-radius: 1 !important;
-        color: @sf-dark-gray;
-        font-weight: 400;
-
-        &.active {
-          border: none;
-        }
+    .ui.menu {
+      a.item {
+        font-size: 20px;
       }
     }
 
-    div.info {
-      width: 100%;
-      margin-bottom: 1em;
-      color: @sf-medium-gray2;
-      font-size: 12px;
+    .search-cards {
+      margin-top: 1em;
     }
 
-    div.cards {
-      display: grid;
-      justify-content: space-between;
-      column-gap: 5px;
-      grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-
-      div.ui.card {
-        width: auto !important;
-        max-width: 360px;
+    .ui.cards {
+      .ui.card {
+        margin-top: 2em;
+        color: @deepBlue;
         cursor: pointer;
 
-        .header {
-          padding: 0px;
-          color: @sf-blue;
-          font-size: 1rem !important;
-          font-weight: 400 !important;
+        .content {
+          flex-grow: initial;
+          padding: 0;
+          padding-bottom: 0.5em;
         }
 
-        img.facet-option-icon {
-          display: inline;
-          // width: auto;
-          // height: 30px !important;
-          margin-left: 0.5em;
-          background: white;
-          // float: right;
-          -webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */
-          filter: grayscale(100%);
+        .content > .header {
+          color: @deepBlue;
+          font-size: 18px;
+          font-weight: 400;
         }
-      }
-    }
-
-    div.cards {
-      div.card {
-        // width: 275px;
-        // margin: 0.5em;
-        // border-radius: 2 !important;
-        // cursor: pointer;
-
-        // div.header {
-        //   padding: 0px;
-        //   color: @sf-blue;
-        //   font-size: 1rem !important;
-        //   font-weight: 400 !important;
-        // }
 
-        div.extra.content {
-          padding: 10px 10px 15px 15px;
-          border-top: none !important;
-
-          span.count {
-            padding: 5px 15px;
-            background: @sf-light-gray;
-            border-radius: 5px;
-            color: @sf-medium-gray2;
-            font-size: 14px;
-          }
+        .content.extra {
+          color: @deepBlue;
         }
 
         &:hover {
-          border: none !important;
-          background: @sf-azure;
+          border: none;
           box-shadow: none;
-
-          div.header {
-            color: white;
-          }
-
-          div.extra.content {
-            span.count {
-              background: @sf-dark-azure;
-              color: white;
-            }
-          }
         }
-      }
-    }
-  }
-}
-
-.tile {
-  padding: 18px;
-  margin: 0 12px 12px 0;
-  @media only screen and (min-width: 1536px) {
-    width: 23%;
-  }
-  @media only screen and (min-width: 900px) and (max-width: 1535px) {
-    width: 31%;
-  }
-  @media only screen and (min-width: 620px) and (max-width: 900px) {
-    width: 47%;
-  }
-  @media only screen and (max-width: 620px) {
-    width: 95%;
-  }
 
-  h2 {
-    border-bottom: 1px solid white;
-    margin: 0 0 1em 0;
-    margin-bottom: 0;
-    font-size: 200%;
-    font-weight: bold;
-    line-height: 1.3;
-  }
-
-  span {
-    font-size: 250%;
-    font-weight: bold;
-  }
-
-  &.available_content {
-    height: 434px;
-
-    h2 {
-      border-bottom: 1px solid #115c57;
-      color: #115c57;
-      font-size: 200%;
-    }
-
-    h3 {
-      color: #115c57;
-    }
-
-    span {
-      color: #1b928f;
-    }
-  }
-}
-
-@media only screen and (max-width: 1200px) {
-  div.searchapp.landing-page {
-    div.landing-page-container {
-      div.landing-page {
-        max-width: 100% !important;
-      }
-    }
-  }
-}
-
-@media only screen and (min-width: 770px) {
-  div.searchapp {
-    &.landing-page {
-      div.landing-page-container {
-        div.landing-page {
-          div.cards {
-            grid-template-columns: repeat(
-              auto-fit,
-              minmax(280px, 1fr)
-            ) !important;
-          }
-        }
-      }
-    }
-  }
-}
-
-@media only screen and (max-width: 770px) {
-  div.searchapp.landing-page {
-    div.landing-page-container {
-      div.landing-page {
-        padding: 1em;
-
-        div.filters {
-          button {
-            padding: 0.5em 0.7em;
-            margin: 3px 5px 3px 0px;
-            font-size: 14px;
-          }
-        }
-
-        div.ui.cards {
-          div.ui.card {
-            div.header {
-              font-size: 12px !important;
-            }
-
-            div.content {
-              padding: 0.7em !important;
-
-              &.extra {
-                padding-top: 0px !important;
-              }
-            }
-
-            span.count {
-              font-size: 10px;
-            }
-          }
+        img.facet-option-icon {
+          display: block;
+          width: auto;
+          height: 30px !important;
+          margin-bottom: 0.5em;
+          filter: grayscale(100%);
         }
       }
     }
   }
-}
-
-@media only screen and (max-width: 400px) {
-  div.searchapp.landing-page {
-    div.landing-page-container {
-      div.landing-page {
-        padding: 1em;
-      }
-    }
-  }
-}
 
-@media only screen and (max-width: 260px) {
-  div.searchapp.landing-page {
-    div.landing-page-container {
-      div.landing-page {
-        div.ui.cards {
-          display: block !important;
-        }
-      }
-    }
+  div.info {
+    width: 100%;
+    margin-bottom: 1em;
+    color: @sf-medium-gray2;
+    font-size: 12px;
   }
 }
diff --git a/src/SearchBlock/less/paging.less b/src/SearchBlock/less/paging.less
index 509624b26..37674a74c 100644
--- a/src/SearchBlock/less/paging.less
+++ b/src/SearchBlock/less/paging.less
@@ -2,7 +2,7 @@
   display: inline-block;
   margin-right: 0.5em;
   margin-left: 0.4em;
-  color: @s-dark-gray;
+  color: @deepBlue;
   font-size: 12px;
 }
 
@@ -10,6 +10,6 @@ div.prev-next-paging button.next,
 div.prev-next-paging button.prev,
 button.download-btn {
   background: @sf-light-gray !important;
-  color: @sf-azure !important;
+  color: @secondaryColor !important;
   font-size: 10px !important;
 }
diff --git a/src/SearchBlock/less/searchbox.less b/src/SearchBlock/less/searchbox.less
index e5bfd678f..897f96961 100644
--- a/src/SearchBlock/less/searchbox.less
+++ b/src/SearchBlock/less/searchbox.less
@@ -4,15 +4,7 @@
   flex-direction: column;
   align-items: stretch;
   justify-content: center;
-  margin: 2em 0 1em 0;
-
-  // #exact-phrases-facet {
-  //   .searchinput-boolean-facet();
-  // }
-  //
-  // #archived-facet {
-  //   .searchinput-boolean-facet();
-  // }
+  margin: 3em 0 2em 0;
 
   .extra-facets {
     display: flex;
@@ -60,7 +52,6 @@
   .search-input {
     display: flex;
     width: 100%;
-    max-width: 1000px;
     flex-wrap: wrap;
     align-items: center;
     padding: 0;
@@ -69,16 +60,26 @@
     .terms-box {
       display: flex;
       width: 100%;
-      padding: 10px;
-      border: 1px solid @sf-medium-gray;
+      border: none;
+      border-bottom: 1.5px solid @secondaryColor;
 
       .terms-box-left {
         flex-grow: 0;
+
+        .icon {
+          width: 38px;
+          height: 38px;
+          color: @secondaryColor !important;
+          font-size: 38px;
+        }
       }
 
       input {
         width: calc(100% - 55px);
         border: none;
+        color: @deepBlue;
+        font-family: @headerFont;
+        font-size: 40px;
 
         &:focus-visible {
           border: none !important;
@@ -86,6 +87,11 @@
         }
       }
 
+      input::placeholder {
+        color: @deepBlue;
+        font-weight: 200;
+      }
+
       div.button {
         padding: 0px !important;
         margin: 0px;
@@ -102,11 +108,53 @@
 
     div.input-controls {
       display: flex;
+      align-items: center;
       margin-top: 2px;
       margin-left: auto;
 
+      .clear-button {
+        position: relative;
+        width: 28px;
+        height: 28px;
+        border: 2px solid @secondaryColor !important;
+        margin-right: 20px;
+        border-radius: 4px;
+        box-shadow: none;
+        opacity: 1;
+
+        &:hover {
+          border: none;
+          box-shadow: none;
+          outline: none;
+        }
+      }
+
       i.close.icon {
-        color: @sf-azure;
+        position: absolute;
+        top: 5px;
+        left: 0;
+        margin: 0 !important;
+        color: @secondaryColor;
+        opacity: 1;
+
+        &:before,
+        &:after {
+          position: absolute;
+          top: 0;
+          left: 11px;
+          width: 2px;
+          height: 15px;
+          background-color: @secondaryColor !important;
+          content: ' ';
+        }
+
+        &:before {
+          transform: rotate(45deg);
+        }
+
+        &:after {
+          transform: rotate(-45deg);
+        }
       }
 
       div.show-extra-facets {
@@ -165,7 +213,7 @@
   div.boolean-facet {
     div.toggle {
       label {
-        color: @s-dark-gray !important;
+        color: @deepBlue !important;
 
         &:before {
           box-shadow: 0px 0px 0px 2px @sf-medium-gray2 !important;
@@ -179,8 +227,8 @@
       &.checked {
         label {
           &:before {
-            background-color: @sf-azure !important;
-            box-shadow: 0px 0px 0px 2px @sf-azure !important;
+            background-color: @secondaryColor !important;
+            box-shadow: 0px 0px 0px 2px @secondaryColor !important;
           }
         }
       }
@@ -188,6 +236,54 @@
   }
 }
 
+.ui.list {
+  > .item {
+    padding-top: 0 !important;
+    padding-bottom: 1em !important;
+    color: @deepBlue !important;
+    font-size: 18px !important;
+    font-weight: 400 !important;
+  }
+}
+
+.demo-question {
+  margin-top: 2.5em;
+
+  //TODO: move list with more space to design system
+  .ui.list {
+    margin-top: 2em !important;
+
+    > .item:not(:last-child) {
+      padding-bottom: 3.5em !important;
+    }
+  }
+
+  .ui.basic.button.explore-more-queries {
+    display: flex;
+    align-items: center;
+    color: @deepBlue !important;
+    float: right;
+    font-size: 20px;
+    font-weight: 700;
+
+    .icon {
+      display: flex;
+      align-items: center;
+      margin: 0 5px !important;
+      font-size: 30px;
+      opacity: 1;
+    }
+
+    &:hover,
+    &:active,
+    &:focus {
+      border: none;
+      background: transparent;
+      box-shadow: none;
+    }
+  }
+}
+
 .sui-search-box__submit {
   flex-shrink: 0;
   padding: 16px;
@@ -259,24 +355,16 @@
 
 .sui-search-box__autocomplete-container {
   position: absolute;
-  top: calc(3em + 10px);
+  top: calc(3em + 4px);
   right: 0;
   left: 0;
   display: none;
-  max-width: 1000px;
+  // max-width: 1000px;
   flex-direction: column;
   padding: 24px 0 12px 0;
-  border-top: 1px solid #ccc;
-  border-right: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  border-left: 1px solid #ccc;
   margin: 0;
   background: white;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  box-shadow: rgba(59, 69, 79, 0.3) 0px 2px 4px;
+  box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
   line-height: 1.5;
 }
 
@@ -298,12 +386,10 @@
 }
 
 .sui-search-box__autocomplete-container li {
-  padding: 4px 12px;
-  margin: 0 12px;
-  border-radius: 4px;
-  color: #555;
-  cursor: default;
-  font-size: 0.9em;
+  padding: 8px 40px;
+  color: @primaryColor;
+  cursor: pointer;
+  font-size: 18px;
 }
 
 .sui-search-box__autocomplete-container li em {
@@ -323,7 +409,7 @@
 }
 
 .sui-search-box__autocomplete-container li[aria-selected='true'] {
-  background: #3a56e4;
+  background: @primaryColor;
   color: #ffffff;
 }
 
@@ -333,37 +419,58 @@
 }
 
 .sui-search-box__section-title {
-  padding: 0 0 4px 24px;
+  padding: 0 0 4px 40px;
   color: #888;
   font-size: 0.7em;
   font-weight: normal;
   letter-spacing: 1px;
   text-transform: uppercase;
+  // display: none;
 }
 
-@media only screen and (max-width: 1080px) {
-  div.sui-search-box {
-    width: 100% !important;
-    margin: initial !important;
+@media only screen and (max-width: @largestMobileScreen) {
+  .sui-search-box .search-input .terms-box input {
+    font-size: 34px;
   }
-}
 
-@media screen and (max-width: 770px) and (min-width: 600px) {
-  div.header-content {
-    position: relative;
-    left: 15px;
+  .sui-search-box .search-input .terms-box input::placeholder {
+    font-size: 24px;
   }
 }
 
-@media screen and (max-width: 770px) {
-  div.ui.container.stackable.two.column.grid.header-columns {
-    margin-left: 0px !important;
+@media only screen and (max-width: 357px) {
+  .sui-search-box .search-input .terms-box input,
+  .sui-search-box__autocomplete-container li {
+    font-size: 14px;
   }
-}
 
-@media screen and (max-width: 600px) {
-  div.header-content {
-    position: relative;
-    left: 15px;
+  .sui-search-box__autocomplete-container {
+    right: 50%;
+    left: 50%;
+    width: 100vw;
+    margin-right: -50vw;
+    margin-left: -50vw;
+  }
+
+  .sui-search-box__section-title,
+  .sui-search-box__autocomplete-container li {
+    padding: 8px 35px;
+  }
+
+  .sui-search-box .search-input div.input-controls .clear-button {
+    width: 20px;
+    height: 20px;
+
+    .close.icon {
+      top: 2px;
+      left: -4px;
+
+      &:before,
+      &:after {
+        top: 0;
+        left: 11px;
+        height: 12px;
+      }
+    }
   }
 }
diff --git a/src/SearchBlock/less/searchinput.less b/src/SearchBlock/less/searchinput.less
deleted file mode 100644
index 229d7985e..000000000
--- a/src/SearchBlock/less/searchinput.less
+++ /dev/null
@@ -1,190 +0,0 @@
-div.extra-facets {
-  position: absolute;
-  z-index: 10;
-  width: 95%;
-  max-width: 570px;
-  flex-wrap: wrap;
-  padding: 10px;
-  border: 1px solid @sf-medium-gray;
-  border-top: none;
-  margin-top: 0px;
-  background: white !important;
-  -webkit-box-shadow: 0px 10px 13px -8px @sf-medium-gray;
-  box-shadow: 0px 10px 13px -8px @sf-medium-gray;
-
-  div#exact-phrases-facet label {
-    padding-left: 3rem !important;
-    color: black !important;
-  }
-}
-
-div.search-input {
-  div.terms-box {
-    display: flex;
-    width: 100%;
-    padding: 10px;
-    border: 1px solid @sf-medium-gray;
-
-    .terms-box-left {
-      flex-grow: 0;
-    }
-
-    input {
-      // width: calc(100% - 55px);
-      // border: none;
-
-      &:focus-visible {
-        border: none !important;
-        outline: none;
-      }
-    }
-
-    div.button {
-      padding: 0px !important;
-      margin: 0px;
-
-      i.icon {
-        position: relative;
-        top: 1px;
-        left: 3px;
-        padding: 0px;
-        margin: 0px;
-      }
-    }
-  }
-
-  div.input-controls {
-    display: flex;
-    margin-top: 2px;
-    margin-left: auto;
-
-    i.close.icon {
-      color: @sf-azure;
-    }
-
-    div.show-extra-facets {
-      padding: 14px !important;
-      border: 1px solid @sf-medium-gray;
-      border-left: none;
-      margin-right: 4px;
-      background: white !important;
-      border-radius: 0px;
-      color: @sf-dark-gray !important;
-      cursor: initial;
-
-      i.icon {
-        margin: 0px;
-        cursor: pointer;
-      }
-
-      &.opened {
-        border-bottom: 1px solid white !important;
-        background: white !important;
-      }
-    }
-
-    div.button.microphone-input {
-      background: @sf-light-gray !important;
-      border-radius: 20px;
-
-      i.icon {
-        color: @sf-dark-gray !important;
-      }
-    }
-  }
-}
-
-.demo-question {
-  margin-top: 0.5em;
-  font-size: 14px;
-
-  span {
-    color: @sf-dark-gray;
-  }
-
-  a.button {
-    display: inline;
-    background: @sf-light-gray;
-    color: @sf-blue !important;
-    font-size: 16px;
-  }
-
-  .dropdown {
-    .text {
-      padding-left: 0.5em;
-    }
-
-    .menu {
-      .item {
-        min-width: 20em;
-        white-space: normal;
-
-        span.text {
-          padding: initial;
-        }
-      }
-    }
-  }
-}
-
-@keyframes demoQuestion {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-
-p.demo-question {
-  color: black;
-
-  a.ui.basic.button {
-    padding: 0px !important;
-    animation-duration: 0.8s;
-    animation-name: demoQuestion;
-    font-size: small;
-  }
-}
-
-p.demo-question {
-  margin-top: 0.5em;
-  font-size: 14px;
-
-  span {
-    color: @sf-dark-gray;
-  }
-
-  a {
-    background: @sf-light-gray;
-    color: @sf-blue;
-    font-size: 16px;
-  }
-
-  a.explore-more-queries {
-    font-size: 14px;
-  }
-
-  a.explore-more-queries.ui.button.compact {
-    font-weight: 400;
-  }
-
-  a.ui.button {
-    border: none !important;
-    box-shadow: none !important;
-
-    &:hover {
-      border: none !important;
-      box-shadow: none !important;
-    }
-  }
-
-  a.ui.button.compact {
-    border: none !important;
-    background: transparent;
-    box-shadow: none !important;
-    color: @sf-azure !important;
-    font-weight: bold;
-  }
-}
diff --git a/src/SearchBlock/less/searchresult.less b/src/SearchBlock/less/searchresult.less
index 1c0eb6d98..472e81db6 100644
--- a/src/SearchBlock/less/searchresult.less
+++ b/src/SearchBlock/less/searchresult.less
@@ -53,8 +53,8 @@ a.ui.basic.button.suggestions-button {
 }
 
 div#page-document div.cards {
-  margin-bottom: 0px;
-  clear: both;
+  // margin-bottom: 0px;
+  // clear: both;
 
   div.card-item {
     width: unset;
@@ -232,18 +232,18 @@ div#page-document div.searchapp div.cards div.search-result {
   margin-bottom: 1.5em;
   clear: both;
 
-  div.menu.mlt {
-    top: -100%;
-    left: -5px;
-
-    div.item {
-      padding: 5px !important;
-      background: @sf-azure;
-      color: white;
-      font-size: 10px;
-      font-weight: 400;
-    }
-  }
+  // div.menu.mlt {
+  //   top: -100%;
+  //   left: -5px;
+  //
+  //   div.item {
+  //     padding: 5px !important;
+  //     background: @secondaryColor;
+  //     color: white;
+  //     font-size: 10px;
+  //     font-weight: 400;
+  //   }
+  // }
 
   &:hover {
     div.controls {
@@ -261,30 +261,42 @@ div#page-document div.searchapp div.cards div.search-result {
     color: @sf-blue !important;
   }
 
-  button.mlt {
-    position: relative;
-    top: -1px;
-    margin-left: 0.5em;
-    font-size: 10px;
-    opacity: 0;
+  // button.mlt {
+  //   position: relative;
+  //   top: -1px;
+  //   margin-left: 0.5em;
+  //   font-size: 10px;
+  //   opacity: 0;
+  // }
+
+  .result-description {
+    margin-bottom: 0.8em;
   }
 
-  div.col-full {
-    width: 100%;
+  .source {
+    a {
+      color: @mediumPersianBlue;
+      font-size: 16px;
+    }
+  }
 
-    div.meta {
-      margin-bottom: 0px;
-      font-size: 12px !important;
+  .tags-list {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 0.5em;
+    color: @secondaryColor;
+    font-size: 16px;
+    font-weight: 700;
+    gap: 1.5em;
+  }
 
-      div.tags-list {
-        display: flex;
-        flex-wrap: wrap;
-        margin-bottom: 0.3em;
-        color: @sf-dark-gray;
-        font-size: 16px;
-        font-weight: 200;
-        gap: 1em;
-      }
+  .col-full {
+    width: 100%;
+
+    .meta {
+      display: flex;
+      align-items: center;
+      margin-bottom: 0.5em;
 
       span.score {
         padding: 0px 5px 0px 5px;
@@ -305,6 +317,9 @@ div#page-document div.searchapp div.cards div.search-result {
 
         .tags {
           display: block;
+          margin: 0 1.2em;
+          color: @deepBlue;
+          font-size: 16px;
         }
       }
 
@@ -366,6 +381,11 @@ div#page-document div.searchapp div.cards div.search-result {
     }
   }
 
+  span.date {
+    color: #808285;
+    font-size: 16px;
+  }
+
   div.col-left {
     width: calc(100% - 180px);
     padding-top: 0px;
@@ -378,13 +398,19 @@ div#page-document div.searchapp div.cards div.search-result {
       width: 100% !important;
     }
 
-    span.date {
-      color: @sf-medium-gray2;
+    h3,
+    h3 > a {
+      color: @deepBlue;
+      font-size: 20px;
+      font-weight: 700;
     }
 
-    h3 {
-      margin-bottom: 0px !important;
-      font-weight: 400;
+    .result-description {
+      p {
+        color: @deepBlue;
+        font-size: 20px !important;
+        line-height: 24px;
+      }
     }
 
     div.ui.breadcrumb {
@@ -410,24 +436,13 @@ div#page-document div.searchapp div.cards div.search-result {
       font-size: 14px !important;
     }
 
-    div.source {
-      margin-bottom: 10px;
-      font-size: 10px !important;
-
-      span {
-        overflow: hidden;
-        white-space: nowrap;
-        // color: @sf-blue;
-      }
-    }
-
-    h3,
-    p {
-      margin: 0px 0px 10px 0px;
-    }
+    // h3,
+    // p {
+    //   margin: 0px 0px 10px 0px;
+    // }
 
     p {
-      color: @s-dark-gray;
+      color: @deepBlue;
       font-size: 12.8px;
     }
   }
diff --git a/src/SearchBlock/less/searchview.less b/src/SearchBlock/less/searchview.less
index df8922fc4..df7f68f48 100644
--- a/src/SearchBlock/less/searchview.less
+++ b/src/SearchBlock/less/searchview.less
@@ -4,22 +4,10 @@ div#page-document {
   }
 
   .searchlib-block {
-    position: relative;
-    right: 50%;
-    left: 50%;
-    width: 100vw !important;
-    max-width: none !important;
-    margin-right: -50vw !important;
-    margin-left: -50vw !important;
+    color: @deepBlue;
 
     div.searchapp {
       margin: 1em 0;
-      background-color: white;
-
-      div > div.ui.container {
-        padding-right: 0px !important;
-        padding-left: 0px !important;
-      }
 
       i.icon.dropdown:before,
       .ui.accordion .title .dropdown.icon:before,
@@ -46,7 +34,7 @@ div#page-document {
       margin: 0 !important;
 
       div.col-mid {
-        padding: 0 40px;
+        // padding: 0 40px;
 
         div.cards {
           margin-bottom: 5px;
@@ -142,12 +130,12 @@ div#page-document {
 
         div.checked {
           label {
-            color: @sf-azure !important;
+            color: @secondaryColor !important;
             font-weight: 600;
 
             &:before {
-              background-color: @sf-azure !important;
-              box-shadow: 0px 0px 0px 2px @sf-azure !important;
+              background-color: @secondaryColor !important;
+              box-shadow: 0px 0px 0px 2px @secondaryColor !important;
             }
 
             &:after {
@@ -161,8 +149,8 @@ div#page-document {
         width: auto !important;
         padding-bottom: 1em;
         padding-left: 0px !important;
-        margin-left: 20px;
-        font-size: 12px;
+        margin-left: 10px;
+        font-size: 16px;
 
         div.text {
           margin-right: 2px;
@@ -175,7 +163,7 @@ div#page-document {
           }
 
           > i.icon {
-            color: @sf-azure;
+            color: @secondaryColor;
           }
 
           i.icon {
@@ -190,7 +178,7 @@ div#page-document {
 
         div.buttons {
           button {
-            background: @s-light-gray;
+            background: @midGray;
             font-size: 12px;
           }
 
@@ -200,18 +188,18 @@ div#page-document {
         }
       }
 
-      button.ui.button i {
+      .ui.button i {
         margin: 0px;
       }
 
-      div.sorting {
+      .sorting {
         width: auto;
         margin-bottom: 0.5em;
-        margin-left: 25px;
-        font-size: 12px;
+        // margin-left: 10px;
+        font-size: 16px;
 
-        div.inline.dropdown > span {
-          color: @sf-azure;
+        .inline.dropdown > span {
+          color: @secondaryColor;
           font-weight: 600;
         }
 
@@ -265,6 +253,12 @@ div#page-document {
         }
       }
     }
+
+    .top-filter-layout {
+      .results-layout {
+        max-width: none !important;
+      }
+    }
   }
 }
 
@@ -282,13 +276,6 @@ body.searchlib-page {
   div#main > div.ui.breadcrumbs {
     display: none;
   }
-
-  div#page-document {
-    width: 100vw !important;
-    padding-top: 0px !important;
-    padding-bottom: 0px !important;
-    margin-top: 0px !important;
-  }
 }
 
 .sui-app-info {
@@ -406,10 +393,6 @@ p.highlight-description\.highlight {
 
   body.searchlib-page {
     &.has-toolbar {
-      div#page-document .searchlib-block {
-        width: calc(100% - 80px) !important;
-      }
-
       div.header-wrapper[role='banner'] {
         div.ui.container:first-of-type {
           width: calc(100vw - 100px) !important;
@@ -418,10 +401,6 @@ p.highlight-description\.highlight {
     }
 
     &.has-toolbar-collapsed {
-      div#page-document .searchlib-block {
-        width: calc(100% - 20px) !important;
-      }
-
       div.header-wrapper[role='banner'] {
         div.ui.container:first-of-type {
           width: calc(100vw - 50px) !important;
diff --git a/src/SearchBlock/less/styles.less b/src/SearchBlock/less/styles.less
index 46f259ebe..84c8a8e21 100644
--- a/src/SearchBlock/less/styles.less
+++ b/src/SearchBlock/less/styles.less
@@ -3,15 +3,12 @@
 @type: extra;
 @element: custom;
 
-// @import (multiple) '~@eeacms/search-less/theme.less';
-
 @import '~./variables.less';
 @import '~./answersbox.less';
 @import '~./filterlist.less';
 @import '~./facets.less';
 @import '~./searchresult.less';
 @import '~./searchbox.less';
-@import '~./searchinput.less';
 @import '~./searchview.less';
 @import '~./paging.less';
 @import '~./landingpage.less';
diff --git a/src/SearchBlock/less/variables.less b/src/SearchBlock/less/variables.less
index b3bb97fce..b63287bcb 100644
--- a/src/SearchBlock/less/variables.less
+++ b/src/SearchBlock/less/variables.less
@@ -1,7 +1,5 @@
-@s-dark-gray: #222222; // 545454
 @s-medium-gray2: #545454;
 @s-medium-gray: #e0e1e2; // rgba(0, 0, 0, 0.85)
-@s-light-gray: #edf1f2;
 @s-light-orange: #ffdfbb;
 @s-dark-orange: #9c5a0a;
 @s-light-blue: #cfe8fb;
@@ -9,7 +7,6 @@
 
 @sf-light-gray: #f2f2f2;
 @sf-light-gray2: #e0e1e2;
-@sf-azure: #2d9390;
 @sf-dark-azure: #267f7c;
 @sf-blue: #0f4b87;
 @sf-medium-gray: #cccccc;