diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
index 344b459e723ca..eb148c5be7219 100644
--- a/administrator/templates/atum/joomla.asset.json
+++ b/administrator/templates/atum/joomla.asset.json
@@ -76,6 +76,11 @@
         "template.atum.base",
         "template.atum.rtl#style"
       ]
+    },
+    {
+      "name": "searchtools",
+      "type": "style",
+      "uri": "system/searchtools/searchtools.min.css"
     }
   ]
 }
diff --git a/administrator/templates/atum/scss/blocks/_searchtools.scss b/administrator/templates/atum/scss/blocks/_searchtools.scss
deleted file mode 100644
index ca3ecc5f9cafe..0000000000000
--- a/administrator/templates/atum/scss/blocks/_searchtools.scss
+++ /dev/null
@@ -1,152 +0,0 @@
-// Search tools
-
-.js-stools {
-  position: relative;
-  padding: 0.25rem 0 0;
-  margin-bottom: 0.5rem;
-
-  > div {
-      margin-bottom: 0.5rem;
-  }
-
-  .js-stools-container-filters {
-    display: none;
-    flex-direction: row;
-    flex-wrap: wrap;
-    padding: 1rem .5rem .5rem;
-    margin-top: 0.5rem;
-    margin-bottom: 1rem;
-    background-color: $white;
-    border: solid var(--border);
-    border-width: 1px 0;
-    border-radius: 0 0 0 $border-radius;
-    box-shadow: $atum-box-shadow;
-    width: 100%;
-
-    joomla-field-fancy-select .choices,
-    .custom-select {
-      min-width: 15rem;
-    }
-
-    &.js-filters-show {
-      display: flex;
-    }
-
-    .chzn-container-single {
-      display: block;
-
-      .chzn-single {
-        display: block;
-        font-size: 1rem;
-      }
-    }
-  }
-
-  .js-stools-field-filter {
-
-      margin: 0 .5rem .5rem;
-
-      @include media-breakpoint-down(sm)
-      {
-          width: 100%;
-      }
-
-    .custom-select {
-
-      &.active {
-        color: var(--white);
-        background: $custom-select-bg $custom-select-indicator-active no-repeat right center;
-        background-size: $custom-select-bg-size;
-      }
-
-      option {
-        color: var(--atum-text-dark);
-        background-color: var(--white);
-        font-size: 0.875rem;
-      }
-    }
-  }
-
-  .js-stools-container-selector,
-  .js-stools-container-selector-first  {
-     @include media-breakpoint-down(md){
-        float:none;
-        width:100%;
-        margin-right:0.5rem;
-    }
-
-    .js-stools-field-selector{
-        @include media-breakpoint-down(sm) {
-            max-width:100%;
-            margin-right:0.5rem;
-
-            [dir=rtl] & {
-              margin-right: 0;
-            }
-        }
-    }
-  }
-
-  .js-stools-container-bar {
-
-    .btn-toolbar {
-
-      .js-stools-btn-filter{
-        border:1px solid var(--border);
-      }
-      .js-stools-btn-clear {
-        background-color: var(--atum-bg-dark);
-        color: var(--atum-text-light);
-        border:1px solid var(--border);
-        border-left: 1px solid var(--atum-text-light);
-
-        [dir=rtl] & {
-          margin-left: 5px;
-          margin-right: -1px !important;
-        }
-
-        @include media-breakpoint-down(sm) {
-          [dir=rtl] & {
-            margin-left: 0 !important;
-          }
-        }
-
-        &.disabled,
-        &:disabled{
-            background-color: rgba($gray-300, 0.8);
-            border-color: rgba($gray-500, 0.8);
-            opacity:1;
-            color:var(--atum-text-dark);
-            cursor: not-allowed;
-        }
-      }
-      .js-stools-btn-filter{
-        border-right:1px solid var(--border);
-        .fa {
-          margin-left: 0.25rem;
-        }
-      }
-
-      .form-control{
-        height:auto;
-      }
-    }
-
-    .js-stools-field-list{
-      margin-bottom:0;
-      .custom-select{
-        box-shadow: none;
-      }
-    }
-
-    .input-append {
-      margin-bottom: 0;
-    }
-  }
-}
-
-.js-stools-button-sort {
-  cursor: pointer;
-  background: none;
-  border: 0;
-}
diff --git a/administrator/templates/atum/scss/system/searchtools/searchtools.scss b/administrator/templates/atum/scss/system/searchtools/searchtools.scss
new file mode 100644
index 0000000000000..6f9d9d0c444e7
--- /dev/null
+++ b/administrator/templates/atum/scss/system/searchtools/searchtools.scss
@@ -0,0 +1,261 @@
+// Search tools
+@import "../../variables";
+@import "../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../media/vendor/bootstrap/scss/mixins";
+
+
+/* Media queries */
+@media (max-width: 480px) {
+  .js-stools .js-stools-container-filters {
+    display: block;
+  }
+  .js-stools .js-stools-container-filters .btn-group {
+    display: block;
+  }
+  .js-stools .js-stools-container-filters .btn-wrapper {
+    width: 100%
+  }
+  .js-stools .js-stools-container-bar {
+    margin-top: 20px;
+  }
+}
+@media (min-width: 768px) and (max-width: 979px) {
+  .js-stools .js-stools-container-selector,
+  .js-stools .js-stools-container-bar,
+  .js-stools .js-stools-container-list {
+    display: block;
+  }
+}
+
+.js-stools {
+  position: relative;
+  width: 100%;
+  padding: 0.25rem 0 0;
+  margin-bottom: 0.5rem;
+
+  > div {
+    margin-bottom: 0.5rem;
+  }
+
+  .js-stools-container-filters {
+    display: none;
+    flex-direction: row;
+    flex-wrap: wrap;
+    padding: 1rem .5rem .5rem;
+    margin-top: 0.5rem;
+    margin-bottom: 1rem;
+    background-color: $white;
+    border: solid var(--border);
+    border-width: 1px 0;
+    border-radius: 0 0 0 $border-radius;
+    box-shadow: $atum-box-shadow;
+    width: 100%;
+
+    joomla-field-fancy-select .choices,
+    .custom-select {
+      min-width: 15rem;
+    }
+
+    &.js-filters-show {
+      display: flex;
+    }
+
+    .chzn-container-single {
+      display: block;
+
+      .chzn-single {
+        display: block;
+        font-size: 1rem;
+      }
+    }
+  }
+
+  .js-stools-field-filter {
+
+    margin: 0 .5rem .5rem;
+
+    @include media-breakpoint-down(sm)
+    {
+      width: 100%;
+    }
+
+    .custom-select {
+
+      &.active {
+        color: var(--white);
+        background: $custom-select-bg $custom-select-indicator-active no-repeat right center;
+        background-size: $custom-select-bg-size;
+      }
+
+      option {
+        color: var(--atum-text-dark);
+        background-color: var(--white);
+        font-size: 0.875rem;
+      }
+    }
+  }
+
+  .js-stools-container-selector {
+    [dir=ltr] & {
+      float: left;
+      margin-right: 0.5rem;
+    }
+
+    [dir=rtl] & {
+      float: right;
+      margin-left: 0.5rem;
+      margin-right: 0;
+    }
+  }
+
+  .js-stools-container-selector-first {
+    [dir=ltr] & {
+      margin-right: 0.5rem;
+    }
+
+    [dir=rtl] & {
+      margin-left: 0.5rem;
+    }
+  }
+
+  .js-stools-container-selector,
+  .js-stools-container-selector-first {
+
+    @include media-breakpoint-down(sm) {
+      float: none !important;
+      width: 100%;
+
+      [dir=ltr] & {
+        margin-right: 0;
+      }
+
+      [dir=rtl] & {
+        margin-right: 0;
+      }
+    }
+
+    .js-stools-field-selector {
+      @include media-breakpoint-down(sm) {
+        max-width: 100%;
+        margin-right: 0;
+
+        [dir=rtl] & {
+          margin-right: 0;
+        }
+      }
+    }
+  }
+
+  .js-stools-container-list {
+    [dir=ltr] & {
+      float: right;
+      text-align: right;
+    }
+
+    [dir=rtl] & {
+      float: left;
+      text-align: left;
+    }
+  }
+
+  .chosen-container {
+    [dir=ltr] & {
+      text-align: right;
+    }
+
+    [dir=rtl] & {
+      text-align: left;
+    }
+  }
+
+  .js-stools-container-filters-visible {
+    display: inline-block;
+  }
+
+  .chzn-container-single .chzn-single span {
+    overflow: visible;
+  }
+
+  .js-stools-field-list,
+  .js-stools-field-filter {
+    display: inline-block;
+  }
+
+  .js-stools-container-list .js-stools-field-list:last-child {
+    margin-right: 0;
+  }
+
+  .js-stools-container-bar {
+
+    .btn-toolbar {
+      justify-content: flex-end;
+
+      .js-stools-btn-filter {
+        border:1px solid var(--border);
+      }
+
+      .js-stools-btn-clear {
+        background-color: var(--atum-bg-dark);
+        color: var(--atum-text-light);
+        border:1px solid var(--border);
+        border-left: 1px solid var(--atum-text-light);
+
+        [dir=rtl] & {
+          margin-left: 5px;
+          margin-right: -1px !important;
+        }
+
+        @include media-breakpoint-down(sm) {
+          [dir=rtl] & {
+            margin-left: 0 !important;
+          }
+        }
+
+        &.disabled,
+        &:disabled {
+          background-color: rgba($gray-300, 0.8);
+          border-color: rgba($gray-500, 0.8);
+          opacity:1;
+          color:var(--atum-text-dark);
+          cursor: not-allowed;
+        }
+      }
+      .js-stools-btn-filter {
+        border-right:1px solid var(--border);
+
+        .fa {
+          margin-left: 0.25rem;
+        }
+      }
+
+      .form-control {
+        height:auto;
+      }
+    }
+
+    .js-stools-field-list {
+      margin-bottom:0;
+
+      .custom-select {
+        box-shadow: none;
+      }
+    }
+
+    .input-append {
+      margin-bottom: 0;
+    }
+
+    .btn-primary .caret {
+      border-top: 0;
+      border-bottom: 4px solid #FFF;
+      margin-top: 7px;
+      margin-bottom: 8px;
+    }
+  }
+}
+
+.js-stools-button-sort {
+  cursor: pointer;
+  background: none;
+  border: 0;
+}
diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
index 2b82cac170641..ad2f5b2a072b8 100644
--- a/administrator/templates/atum/scss/template.scss
+++ b/administrator/templates/atum/scss/template.scss
@@ -41,7 +41,6 @@
 @import "blocks/login";
 @import "blocks/modals";
 @import "blocks/quickicons";
-@import "blocks/searchtools";
 @import "blocks/lists";
 @import "blocks/sidebar";
 @import "blocks/sidebar-nav";
diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.es6.js
index 1e53ac07ba8a3..cfdcce30cb7fb 100644
--- a/build/build-modules-js/compilecss.es6.js
+++ b/build/build-modules-js/compilecss.es6.js
@@ -46,6 +46,7 @@ module.exports.compile = (options, path) => {
           `${RootPath}/templates/cassiopeia/scss/template-rtl.scss`,
           `${RootPath}/administrator/templates/atum/scss/template.scss`,
           `${RootPath}/administrator/templates/atum/scss/template-rtl.scss`,
+          `${RootPath}/administrator/templates/atum/scss/system/searchtools/searchtools.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/awesomplete/awesomplete.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/choicesjs/choices.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/minicolors/minicolors.scss`,
diff --git a/build/media_source/system/css/searchtools.css b/build/media_source/system/css/searchtools.css
deleted file mode 100644
index 7c7d6a92a043b..0000000000000
--- a/build/media_source/system/css/searchtools.css
+++ /dev/null
@@ -1,97 +0,0 @@
-.js-stools {
-	width: 100%;
-}
-.js-stools-container-filters {
-	display: none;
-	margin: 10px 0;
-}
-.js-stools-container-bar .input-append {
-	margin-bottom: 0;
-}
-/* Use up caret to hide the search filters */
-.js-stools-container-bar .btn-primary .caret {
-	border-top: 0;
-	border-bottom: 4px solid #FFF;
-	margin-top: 7px;
-	margin-bottom: 8px;
-}
-.js-stools .btn-wrapper {
-	display: inline-block;
-	margin: 0 5px 0 0;
-}
-/* Fixed filter fields (selector) */
-.js-stools .js-stools-container-selector {
-	float: left;
-	margin-right: auto;
-}
-.js-stools .js-stools-container-selector-first {
-	margin-right: 8px;
-}
-html[dir=rtl] .js-stools .js-stools-container-selector {
-	float: none;
-	margin-left: auto;
-	margin-right: 0;
-}
-html[dir=rtl] .js-stools .js-stools-container-selector-first {
-	margin-left: 8px;
-	margin-right: 0;
-}
-.js-stools .js-stools-container-bar .btn-toolbar{
-	justify-content: flex-end;
-}
-.js-stools .js-stools-container-list {
-	float: right;
-	text-align: right;
-}
-html[dir=rtl] .js-stools .js-stools-container-list {
-	float: left;
-	text-align: left;
-}
-.js-stools .chosen-container {
-	text-align: left;
-}
-html[dir=rtl] .js-stools .chosen-container {
-	text-align: right;
-}
-.js-stools .js-stools-container-filters-visible {
-	display: inline-block;
-}
-.js-stools .chzn-container-single .chzn-single span {
-	overflow: visible;
-}
-.js-stools .js-stools-field-list,
-.js-stools .js-stools-field-filter {
-	display: inline-block;
-	margin: 0 5px 5px 0;
-}
-html[dir=rtl] .js-stools .js-stools-field-list,
-.js-stools .js-stools-field-filter {
-	margin: 0 0 5px 5px;
-}
-.js-stools .js-stools-container-list .js-stools-field-list:last-child {
-	margin-right: 0;
-}
-
-/* Media queries */
-@media (max-width: 480px) {
-	.js-stools-container-filters {
-		display: block;
-	}
-	.js-stools-container-filters .btn-group {
-		display: block;
-	}
-	.js-stools-container-filters .btn-wrapper {
-		width: 100%
-	}
-	.js-stools-container-bar {
-		margin-top: 20px;
-	}
-}
-@media (min-width: 768px) and (max-width: 979px) {
-	.js-stools .js-stools-container-selector,
-	.js-stools .js-stools-container-bar,
-	.js-stools .js-stools-container-list {
-		float: none;
-		display: block;
-	}
-}
diff --git a/build/media_source/system/joomla.asset.json b/build/media_source/system/joomla.asset.json
index 5bfc2260bd13b..e9e755570ed1e 100644
--- a/build/media_source/system/joomla.asset.json
+++ b/build/media_source/system/joomla.asset.json
@@ -51,15 +51,7 @@
     {
       "name": "searchtools",
       "type": "style",
-      "uri": "system/searchtools.css"
-    },
-    {
-      "name": "searchtools",
-      "type": "preset",
-      "dependencies": [
-        "searchtools#style",
-        "searchtools#script"
-      ]
+      "uri": ""
     },
     {
       "name": "showon",
diff --git a/libraries/cms/html/searchtools.php b/libraries/cms/html/searchtools.php
index 69c7bcfaa19e2..4687519e2f3e0 100644
--- a/libraries/cms/html/searchtools.php
+++ b/libraries/cms/html/searchtools.php
@@ -50,7 +50,9 @@ public static function form($selector = '.js-stools-form', $options = array())
 			$options = static::optionsToRegistry($options);
 
 			// Load the script && css files
-			Factory::getApplication()->getDocument()->getWebAssetManager()->usePreset('searchtools');
+			Factory::getApplication()->getDocument()->getWebAssetManager()
+				->useStyle('searchtools')
+				->useScript('searchtools');
 
 			Factory::getDocument()->addScriptOptions('searchtools', $options);