diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php
index 9adbb3d2fe80a..db0cb3bffa4c2 100644
--- a/administrator/templates/atum/component.php
+++ b/administrator/templates/atum/component.php
@@ -21,7 +21,7 @@
 
 // Load template CSS file
 HTMLHelper::_('stylesheet', 'bootstrap.css', ['version' => 'auto', 'relative' => true]);
-HTMLHelper::_('stylesheet', 'fontawesome.css', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('stylesheet', 'vendor/fontawesome-free/fontawesome.min.css', ['version' => 'auto', 'relative' => true]);
 HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', ['version' => 'auto', 'relative' => true]);
 
 // Load custom CSS file
diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
index 5d6fa13535091..1f4b5da13961f 100644
--- a/administrator/templates/atum/error_full.php
+++ b/administrator/templates/atum/error_full.php
@@ -50,6 +50,7 @@
 
 // Load specific language related CSS
 HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
+$wa->enableAsset('fontawesome-free');
 
 // Load customer stylesheet if available
 HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
index 505a7d9d1265a..d95929fbb7f35 100644
--- a/administrator/templates/atum/error_login.php
+++ b/administrator/templates/atum/error_login.php
@@ -49,6 +49,7 @@
 
 // Load specific language related CSS
 HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
+$wa->enableAsset('fontawesome-free');
 
 // Load customer stylesheet if available
 HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index c5afa3968da5f..52c5c5884d1fd 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -53,6 +53,7 @@
 
 // Enable assets
 $wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
+$wa->enableAsset('fontawesome-free');
 
 // Load specific language related CSS
 HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
@@ -60,6 +61,9 @@
 // Load customer stylesheet if available
 HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
 
+// TODO: remove the following line whenever the assets are fixed to respect the ovverides
+HTMLHelper::_('stylesheet', 'vendor/choicesjs/choices.css', array('version' => 'auto', 'relative' => true));
+
 // Load specific template related JS
 // TODO: Adapt refactored build tools pt.2 @see https://issues.joomla.org/tracker/joomla-cms/23786
 HTMLHelper::_('script', 'media/templates/' . $this->template . '/js/template.min.js', ['version' => 'auto']);
diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
index 0d41200817098..9ab3012ebc336 100644
--- a/administrator/templates/atum/joomla.asset.json
+++ b/administrator/templates/atum/joomla.asset.json
@@ -37,9 +37,9 @@
       ]
     },
     {
-      "name": "fontawesome",
+      "name": "fontawesome-free",
       "css": [
-        "fontawesome.min.css"
+        "vendor/fontawesome-free/fontawesome.min.css"
       ]
     }
   ]
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index 44d77ac4a0e7e..1dd89fae5690f 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -52,6 +52,7 @@
 
 // Load specific language related CSS
 HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
+$wa->enableAsset('fontawesome-free');
 
 // Load customer stylesheet if available
 HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
diff --git a/administrator/templates/atum/scss/blocks/_global.scss b/administrator/templates/atum/scss/blocks/_global.scss
index dc5080e0b1937..ff7a388a01b59 100644
--- a/administrator/templates/atum/scss/blocks/_global.scss
+++ b/administrator/templates/atum/scss/blocks/_global.scss
@@ -113,8 +113,8 @@ body .container-main {
     top: 0;
     left: 0;
     z-index: -1;
-    // Note IDE's will consider this file import to fail in SCSS but this is correct for the final compiled CSS file
-    background: var(--atum-bg-light) url("../images/joomla-pattern.svg");
+    // Use the ../images/joomla-pattern.svg through https://yoksel.github.io/url-encoder/
+    background: var(--atum-bg-light) url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg version='1.1' id='pattern-tile' xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 257.9 205.7' style='enable-background:new 0 0 257.9 205.7;' xml:space='preserve' preserveAspectRatio='xMinYMid' width='257.9' height='205.7'%3E%3Cg opacity='0.85' %3E%3Cpath fill='%23fff' d='M166.2,113.3c-2.7-3.2-4-6.4-4.1-10.3c0.1-4.1,1.5-7.7,4.1-10.7l26.7-27l0.2-0.2c7-7,6.9-19-0.3-26.3 c-7.2-7.1-19.3-7.3-26.3-0.3l-27.1,26.9c-3.2,2.7-6.4,4-10.3,4.1c-4.1-0.1-7.7-1.5-10.7-4.1l-27-26.7l-0.2-0.2 c-7-7-19-6.9-26.3,0.3c-7.1,7.2-7.3,19.3-0.3,26.3l26.9,27.1c2.7,3.2,4,6.4,4.1,10.3c-0.1,4.1-1.5,7.7-4.1,10.7l-26.7,27l-0.2,0.2 c-7,7-6.9,19,0.3,26.3c3.7,3.6,8.6,5.4,13.4,5.4c4.7,0,9.4-1.7,12.8-5.2l27.1-26.9c3.1-2.6,6.6-4,10.8-4.1 c3.9,0.1,7.1,1.4,10.2,4.1l27,26.7l0.2,0.2c7,7,19,6.9,26.3-0.3c7.1-7.2,7.3-19.3,0.3-26.3L166.2,113.3z M192.2,166 c-6.9,6.8-18.3,6.9-24.9,0.3l-27.2-27c-3.4-2.9-6.7-4.2-10.9-4.4h0c-4.3,0.2-8.1,1.6-11.4,4.4l-27,26.7l-0.2,0.2 c-6.6,6.6-18,6.5-24.9-0.3c-6.8-6.9-6.9-18.3-0.3-24.9l27-27.2c2.7-3.2,4.2-7.1,4.4-11.4c-0.1-4.2-1.5-7.5-4.4-10.9l-26.7-27 l-0.2-0.2c-6.6-6.6-6.5-18,0.3-24.9c3.5-3.4,8.1-5.2,12.7-5.2c4.5,0,8.9,1.6,12.1,4.9l27.2,27c3.2,2.7,7.1,4.2,11.4,4.4 c4.2-0.1,7.5-1.5,10.9-4.4l27-26.7l0.2-0.2c6.6-6.6,18-6.5,24.9,0.3c6.8,6.9,6.9,18.3,0.3,24.9l-27,27.2c-2.7,3.2-4.2,7.1-4.4,11.4 c0.1,4.2,1.5,7.5,4.4,10.9l26.7,27l0.2,0.2C199,147.8,198.9,159.2,192.2,166z'/%3E%3Cpath fill='%23fff' d='M200.3,102.9c0-31.4,25.8-57,57.4-57v-1h-0.4v0c-19.7,0.1-37.1,10-47.6,25c7.9-13.6,6.4-32.1-4.6-43.2 c-13.2-13.1-36.7-12.8-50.3,0.8l-21.3,21.9c-1.6,1.4-2.9,1.5-4.3,1.5c-1.6,0-3.3-0.1-4.8-1.5L103,27.4C89.5,13.9,66,13.5,52.7,26.6 c-10.9,11-12.5,29.1-4.9,42.7C37.3,54.6,20.1,44.9,0.6,44.9H0.1v1h0.4c31.4,0,57,25.6,57,57s-25.8,57-57.5,57v1 c19.9,0,37.4-9.9,48-24.9c-7.8,13.6-6.3,31.9,4.7,43c13.2,13.1,36.7,12.8,50.3-0.8l21.3-21.9c1.5-1.4,3.2-1.5,4.8-1.5h0 c1.4,0,2.7,0.1,4.3,1.5l21.3,21.9c6.9,6.9,16.5,10.4,25.9,10.4c9,0,17.9-3.2,24.4-9.6c11-11.1,12.5-29.4,4.7-43 c10.6,15,28.2,24.9,48,24.9v-1C226.1,159.9,200.3,134.3,200.3,102.9z M58.5,102.9c0-10.8-3-20.9-8.1-29.5c0.9,1.3,2,2.5,3.1,3.6 l21.9,21.3c1.4,1.6,1.5,2.9,1.5,4.3c0,1.6-0.1,3.3-1.5,4.8l-21.9,21.3c-1.2,1.2-2.3,2.5-3.3,3.8C55.5,123.8,58.5,113.7,58.5,102.9z M204.4,178.3c-12.9,12.8-35.7,12.4-48.9-0.8l-21.4-21.9c-1.8-1.6-3.2-1.8-4.7-1.8c-0.1,0-0.2,0-0.3,0c-1.7,0-3.7,0.2-5.5,1.8 l-21.3,21.9c-13.2,13.2-36,13.6-48.9,0.8c-12.8-12.8-12.4-35.7,0.8-48.9l21.9-21.4c1.6-1.8,1.8-3.8,1.8-5.5c0-1.6-0.1-3.1-1.8-5 L54.3,76.2c-13.2-13.2-13.6-36-0.8-48.9c12.9-12.8,35.7-12.4,48.9,0.8l21.4,21.9c1.8,1.6,3.8,1.8,5.5,1.8c1.6,0,3.1-0.1,5-1.8 l21.3-21.9c13.2-13.2,36-13.6,48.9-0.8c12.8,12.9,12.4,35.7-0.8,48.9l-21.9,21.4c-1.6,1.8-1.8,3.8-1.8,5.5c0,1.6,0.1,3.1,1.8,5 l21.9,21.3C216.8,142.6,217.2,165.5,204.4,178.3z M204.3,128.7l-21.9-21.3c-1.4-1.6-1.5-2.9-1.5-4.3c0-1.6,0.1-3.3,1.5-4.8 l21.9-21.3c1.2-1.2,2.3-2.5,3.3-3.9c-5.3,8.7-8.3,18.9-8.3,29.8c0,10.8,3,21,8.3,29.6C206.6,131.2,205.5,129.9,204.3,128.7z'/%3E%3C/g%3E%3Cg opacity='0.34'%3E%3Cpath fill='%23fff' d='M197.7,84.9l-36.5-0.2c-4-0.3-7-1.6-9.7-4.1c-2.7-2.9-4.2-6.2-4.5-10l-0.2-36.2v-0.3c0-9.5-8.2-17.5-17.9-17.6 c-9.7,0.1-17.9,8.1-17.9,17.6l-0.2,36.5c-0.3,4-1.6,7-4.1,9.7c-2.9,2.7-6.2,4.2-10,4.5l-36.2,0.2h-0.3c-9.5,0-17.5,8.2-17.6,17.9 c0.1,9.7,8.1,17.9,17.6,17.9l36.5,0.2c4,0.3,7,1.6,9.7,4.1c2.7,2.9,4.2,6.2,4.5,10l0.2,36.2v0.3c0,9.5,8.2,17.5,17.9,17.6 c9.7-0.1,17.9-8.1,17.9-17.6l0.2-36.5c0.3-3.9,1.8-7.1,4.5-10c2.7-2.5,5.7-3.8,9.7-4.1l36.2-0.2h0.3c9.5,0,17.5-8.2,17.6-17.9 C215.1,93.1,207.1,84.9,197.7,84.9z M197.7,119.8l-36.5,0.2c-4.2,0.4-7.4,1.7-10.3,4.4l0,0c-2.8,3-4.4,6.6-4.7,10.7l-0.2,36.2v0.3 c0,8.9-7.8,16.5-16.9,16.6c-9.2-0.1-16.9-7.7-16.9-16.6l-0.2-36.5c-0.3-4-1.9-7.6-4.8-10.7c-2.9-2.7-6.1-4.1-10.3-4.4l-36.2-0.2 h-0.3c-8.9,0-16.5-7.8-16.6-16.9c0.1-9.2,7.7-16.9,16.6-16.9l36.5-0.2c4-0.3,7.6-1.9,10.7-4.8c2.7-2.9,4.1-6.1,4.4-10.3l0.2-36.2 v-0.3c0-8.9,7.8-16.5,16.9-16.6c9.2,0.1,16.9,7.7,16.9,16.6l0.2,36.5c0.3,4,1.9,7.6,4.8,10.7c2.9,2.7,6.1,4.1,10.3,4.4l36.2,0.2 h0.3c8.9,0,16.5,7.8,16.6,16.9C214.2,112,206.6,119.8,197.7,119.8z'/%3E%3Cpath fill='%23fff' d='M232.7,102.9c0-13.8,11.2-25.1,25.1-25.1v-1c-13.9,0-25.2,10.9-26,24.5c-0.9-17.2-16.6-31.9-34.5-31.9 l-29.1,0.4c-2-0.1-3-0.9-3.9-1.9c-1.1-1.1-2.1-2.3-2.2-4.2l0.4-29.2c0-18.3-15.6-34.4-33.4-34.5c-17.8,0.1-33.4,16.2-33.4,34.5 l0.4,29.1c-0.1,2-0.9,3-1.9,3.9c-1.1,1.1-2.3,2.1-4.2,2.2l-29.2-0.4c-17.8,0-33.5,14.8-34.4,31.9C25.4,87.9,14.4,77.2,0.8,76.8h0.2 V38.7h-1v38.2h0.1v1c13.8,0,25.1,11.2,25.1,25.1c0,13.8-11.3,25-25.1,25.1l0,0.9h0V167h1v-38.1c13.4-0.5,24.3-11.2,25.1-24.5 c1,17.1,16.7,31.8,34.5,31.8l29.1-0.4c2,0.1,3,0.9,3.9,1.9c1.1,1.1,2.1,2.3,2.2,4.2l-0.4,29.2c0,18.3,15.6,34.4,33.4,34.5 c17.8-0.1,33.4-16.2,33.4-34.5L162,142c0.1-1.9,1.1-3.2,2.2-4.3l0,0c0.9-1,1.9-1.8,3.9-1.9l29.2,0.4c17.8,0,33.5-14.7,34.4-31.9 c0.8,13.6,12.2,24.5,26.1,24.6l0-1C243.9,127.9,232.7,116.7,232.7,102.9z M197.3,135.3l-29.2-0.4c-2.4,0.1-3.5,1.1-4.6,2.2 c-1.2,1.1-2.4,2.6-2.5,5l0.4,29.2c0,17.8-15.2,33.4-32.4,33.5c-17.3-0.1-32.4-15.7-32.4-33.5l0.4-29.2c-0.1-2.3-1.3-3.8-2.5-4.9 c-1.1-1.1-2.2-2.1-4.6-2.2l-29.2,0.4c-17.8,0-33.4-15.2-33.5-32.4c0.1-17.3,15.7-32.4,33.5-32.4l29.2,0.4c2.3-0.1,3.8-1.3,4.9-2.5 c1.1-1.1,2.1-2.2,2.2-4.6l-0.4-29.2c0-17.8,15.2-33.4,32.4-33.5c17.3,0.1,32.4,15.7,32.4,33.5L161,63.7c0.1,2.3,1.3,3.8,2.5,4.9 c1.1,1.1,2.2,2.1,4.6,2.2l29.2-0.4c17.8,0,33.4,15.2,33.5,32.4C230.7,120.1,215.1,135.3,197.3,135.3z'/%3E%3C/g%3E%3C/svg%3E");
     background-size: 15rem;
   }
 
diff --git a/administrator/templates/atum/scss/fonts/_fontawesome.scss b/administrator/templates/atum/scss/fonts/_fontawesome.scss
deleted file mode 100644
index a41fdcbaf687a..0000000000000
--- a/administrator/templates/atum/scss/fonts/_fontawesome.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-// Font Awesome 5 Free
-@import "../../../../../media/vendor/fontawesome-free/scss/fontawesome";
-@import "../../../../../media/vendor/fontawesome-free/scss/solid";
-@import "../../../../../media/vendor/fontawesome-free/scss/brands";
-
-// B/C for Icomoon
-@import "../../../../../build/media_source/system/scss/icomoon";
-
-// RTL override
-html[dir=rtl] .pull-right {
-    float: left;
-}
\ No newline at end of file
diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
index 09498673488a7..2b82cac170641 100644
--- a/administrator/templates/atum/scss/template.scss
+++ b/administrator/templates/atum/scss/template.scss
@@ -12,16 +12,25 @@
 
 // Fonts
 @import "../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
-@import "fonts/fontawesome";
 
-// Alert
-@import "../../../../build/media_source/system/scss/jalert";
 
-// jQuery Minicolors
-@import "../../../../build/media_source/system/scss/jquery-minicolors";
+@import "blocks/global"; // Leave this first
+
+// Vendor overrides
+@import "vendor/bootstrap/badge";
+@import "vendor/bootstrap/buttons";
+@import "vendor/bootstrap/card";
+@import "vendor/bootstrap/custom-forms";
+@import "vendor/bootstrap/collapse";
+@import "vendor/bootstrap/dropdown";
+@import "vendor/bootstrap/form";
+@import "vendor/bootstrap/lists";
+@import "vendor/bootstrap/modal";
+@import "vendor/bootstrap/nav";
+@import "vendor/bootstrap/pagination";
+@import "vendor/bootstrap/table";
 
 // Blocks
-@import "blocks/global"; // Leave this first
 @import "blocks/alerts";
 @import "blocks/edit";
 @import "blocks/header";
@@ -36,33 +45,16 @@
 @import "blocks/lists";
 @import "blocks/sidebar";
 @import "blocks/sidebar-nav";
-@import "blocks/system-message";
 @import "blocks/toolbar";
 @import "blocks/treeselect";
 @import "blocks/utilities";
-@import "blocks/tabs";
 
-// Vendor overrides
-@import "vendor/awesomplete";
-@import "vendor/bootstrap/badge";
-@import "vendor/bootstrap/buttons";
-@import "vendor/bootstrap/card";
-@import "vendor/bootstrap/custom-forms";
-@import "vendor/bootstrap/collapse";
-@import "vendor/bootstrap/dropdown";
-@import "vendor/bootstrap/form";
-@import "vendor/bootstrap/lists";
-@import "vendor/bootstrap/modal";
-@import "vendor/bootstrap/nav";
-@import "vendor/bootstrap/pagination";
-@import "vendor/bootstrap/table";
+// These DO NOT BELONG HERE!!!
 @import "vendor/codemirror";
-@import "vendor/chosen";
-@import "vendor/choicesjs";
 @import "vendor/dragula";
-@import "vendor/minicolors";
 @import "vendor/tinymce";
 
+// Also these DO NOT BELONG HERE!!!
 // Page specifics
 @import "pages/com_admin";
 @import "pages/com_config";
diff --git a/administrator/templates/atum/scss/vendor/_awesomplete.scss b/administrator/templates/atum/scss/vendor/_awesomplete.scss
deleted file mode 100644
index 62dedb6906f6f..0000000000000
--- a/administrator/templates/atum/scss/vendor/_awesomplete.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// Awesomplete
-
-.awesomplete {
-  display: block;
-}
diff --git a/administrator/templates/atum/scss/vendor/_choicesjs.scss b/administrator/templates/atum/scss/vendor/_choicesjs.scss
deleted file mode 100644
index 83aa577702e17..0000000000000
--- a/administrator/templates/atum/scss/vendor/_choicesjs.scss
+++ /dev/null
@@ -1,154 +0,0 @@
-// choices.js
-
-.choices {
-	border: 0;
-}
-
-.choices__inner {
-	border-radius: 0;
-	border-color: $gray-400;
-}
-
-// Fix position
-.choices__list--dropdown {
-	z-index: $zindex-popover;
-}
-
-// Fix close button
-.choices__button_joomla {
-	position: relative;
-	text-indent: -9999px;
-	cursor: pointer;
-	background: none;
-	border: 0;
-	appearance: none;
-
-	&::before {
-		position: absolute;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		display: block;
-		text-align: center;
-		text-indent: 0;
-		content: "\00d7";
-	}
-
-	&:focus {
-		outline: none;
-	}
-}
-
-.choices[data-type*="select-one"] {
-
-	.choices__button_joomla {
-		position: absolute;
-		top: 50%;
-		right: 0;
-		width: 20px;
-		height: 20px;
-		padding: 0;
-		margin-top: -10px;
-		margin-right: 3rem;
-		border-radius: 10em;
-		opacity: .5;
-
-		&:hover,
-		&:focus {
-			opacity: 1;
-		}
-
-		&:focus {
-			box-shadow: 0 0 0 2px var(--atum-bg-dark-80);
-		}
-	}
-
-	&[dir="rtl"] {
-
-		.choices__button_joomla {
-			right: auto;
-			left: 0;
-			margin-right: 0;
-			margin-left: 25px;
-		}
-	}
-
-	&::after {
-		display: none;
-	}
-
-	.choices__inner {
-		padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
-		background: $custom-select-background;
-		background-color: $custom-select-bg;
-	}
-}
-
-.choices[data-type*="select-multiple"],
-.choices[data-type*="text"] {
-
-	.choices__button_joomla {
-		position: absolute;
-		right: 0;
-		top: 0;
-		display: block;
-		width: 0.5rem;
-		padding: 0.8125rem;
-		height: 1.625rem;
-		line-height: 2;
-		border: 0;
-		opacity: 1;
-		background-color: rgba(0, 0, 0, .2);
-
-		&:hover,
-		&:focus {
-			opacity: 1;
-		}
-
-		&::before {
-			color: $white;
-		}
-	}
-
-	.choices__inner {
-		padding: 0.4rem 1rem 0.256rem;
-	}
-	.choices__input {
-		padding: 0.2rem 0 0.356rem;
-		color: $custom-select-color;
-	}
-}
-
-.choices__list--multiple .choices__item {
-	position: relative;
-	background-color: var(--atum-bg-dark);
-	border: 1px solid var(--atum-bg-dark);
-	border-radius: 0;
-
-	&.is-highlighted {
-		background-color: var(--atum-bg-dark);
-		border: 1px solid var(--atum-bg-dark);
-		opacity: 0.9;
-	}
-
-	&[data-deletable] {
-		padding-right: 1.8125rem;
-	}
-}
-
-.choices__input {
-	margin-bottom: 0;
-	padding: 0;
-	font-size: 1rem;
-}
-
-.choices__inner, .choices__input {
-	background-color: var(--white);
-}
-
-.choices__list--single {
-	padding: 0;
-	font-size: 1rem;
-	color: var(--atum-text-dark);
-}
diff --git a/administrator/templates/atum/scss/vendor/_chosen.scss b/administrator/templates/atum/scss/vendor/_chosen.scss
deleted file mode 100644
index a1dbf0c827b1a..0000000000000
--- a/administrator/templates/atum/scss/vendor/_chosen.scss
+++ /dev/null
@@ -1,125 +0,0 @@
-// Chosen
-
-$chosen-select-padding-y: $custom-select-padding-y + .21;
-
-.chosen-container.chosen-container-single {
-  max-width: $input-max-width;
-  font-size: $font-size-base;
-
-  .chosen-single {
-    display: inline-block;
-    $select-border-width: ($custom-select-border-width * 2);
-    height: #{$input-height};
-    padding: $chosen-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $chosen-select-padding-y $custom-select-padding-x;
-    line-height: 1.5;
-    color: $custom-select-color;
-    vertical-align: middle;
-    background: $custom-select-bg $custom-select-indicator no-repeat right $custom-select-padding-x center;
-    background-size: $custom-select-bg-size;
-    border: $custom-select-border-width solid $custom-select-border-color;
-    box-shadow: none;
-    appearance: none;
-
-    @if $enable-rounded {
-      border-radius: $custom-select-border-radius;
-    } @else {
-      border-radius: 0;
-    }
-
-    abbr {
-      top: 10px;
-    }
-
-    &:focus {
-      @include box-shadow($custom-select-focus-box-shadow);
-      border-color: $custom-select-focus-border-color;
-      outline: none;
-    }
-
-    &:disabled {
-      color: $custom-select-disabled-color;
-      cursor: not-allowed;
-      background-color: $custom-select-disabled-bg;
-    }
-
-    div b {
-      background: none !important;
-    }
-  }
-
-  .chosen-drop {
-    background: var(--white-offset);
-    border: $custom-select-border-width solid $custom-select-border-color;
-  }
-
-  .chosen-results li {
-    line-height: calc(#{$font-size-base} + .3rem);
-  }
-
-  &.chosen-container-active .chosen-single {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-}
-
-.chosen-container.chosen-container-multi {
-
-  .chosen-choices {
-    max-width: $input-max-width;
-    min-height: #{$input-height};
-    font-size: $font-size-base;
-    line-height: $input-line-height;
-    background-image: var(--white);
-
-    li.search-choice {
-      $chosen-multi-close-width: 20px;
-      padding: 5px (13 + $chosen-multi-close-width) 5px 10px;
-      color: var(--atum-text-light);
-      background: colors("atum-bg-dark");
-      border: 0;
-      box-shadow: $atum-box-shadow;
-
-      @if $enable-rounded {
-        border-radius: $custom-select-border-radius;
-      } @else {
-        border-radius: 0;
-      }
-
-      .search-choice-close {
-        top: 0;
-        right: 0;
-        background: rgba(0, 0, 0, 0.2);
-        width: $chosen-multi-close-width;
-        height: 100%;
-        background-image: none !important;
-
-        &::before {
-          position: absolute;
-          top: 6px;
-          right: ($chosen-multi-close-width / 4);
-          content: "\00d7";
-          color: colors("atum-text-light");
-          font-size: $font-size-base;
-        }
-      }
-    }
-  }
-}
-
-.chosen-container-active.chosen-with-drop .chosen-single {
-  box-shadow: none;
-}
-
-// TEMPORARY
-.chosen-container-single {
-  width: auto !important;
-}
-// END TEMPORARY
-
-.card .chosen-container.chosen-container-single {
-  width: 100% !important;
-
-  .chosen-single {
-    width: 100% !important;
-  }
-}
diff --git a/administrator/templates/atum/scss/vendor/awesomplete/awesomplete.scss b/administrator/templates/atum/scss/vendor/awesomplete/awesomplete.scss
new file mode 100644
index 0000000000000..a338ec8260637
--- /dev/null
+++ b/administrator/templates/atum/scss/vendor/awesomplete/awesomplete.scss
@@ -0,0 +1,6 @@
+// Awesomplete
+@import '../../../../../../node_modules/awesomplete/awesomplete';
+
+.awesomplete {
+  display: block;
+}
diff --git a/administrator/templates/atum/scss/vendor/choicesjs/choices.scss b/administrator/templates/atum/scss/vendor/choicesjs/choices.scss
new file mode 100644
index 0000000000000..71a242240200e
--- /dev/null
+++ b/administrator/templates/atum/scss/vendor/choicesjs/choices.scss
@@ -0,0 +1,172 @@
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
+
+// Atum Variables
+@import "../../variables";
+
+// Mixins
+@import "../../mixin";
+
+@import "../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../media/vendor/bootstrap/scss/mixins";
+
+// choices.js
+@import '../../../../../../node_modules/choices.js/src/styles/choices';
+
+.choices {
+  border: 0;
+}
+
+.choices__inner {
+  border-radius: 0;
+  border-color: $gray-400;
+}
+
+// Fix position
+.choices__list--dropdown {
+  z-index: $zindex-popover;
+}
+
+// Fix close button
+.choices__button_joomla {
+  position: relative;
+  text-indent: -9999px;
+  cursor: pointer;
+  background: none;
+  border: 0;
+  appearance: none;
+
+  &::before {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: block;
+    text-align: center;
+    text-indent: 0;
+    content: "\00d7";
+  }
+
+  &:focus {
+    outline: none;
+  }
+}
+
+.choices[data-type*="select-one"] {
+
+  .choices__button_joomla {
+    position: absolute;
+    top: 50%;
+    right: 0;
+    width: 20px;
+    height: 20px;
+    padding: 0;
+    margin-top: -10px;
+    margin-right: 3rem;
+    opacity: .5;
+    border-radius: 0 20px 20px 0;
+
+    &:hover,
+    &:focus {
+      opacity: 1;
+    }
+
+    &:focus {
+      box-shadow: 0 0 0 2px var(--atum-bg-dark-80);
+    }
+  }
+
+  &[dir="rtl"] {
+
+    .choices__button_joomla {
+      right: auto;
+      left: 0;
+      margin-right: 0;
+      margin-left: 25px;
+    }
+  }
+
+  &::after {
+    display: none;
+  }
+
+  .choices__inner {
+    padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
+    background: url(../../../images/select-bg.svg) no-repeat right center / $custom-select-bg-size;
+    background-color: $custom-select-bg;
+  }
+}
+
+.choices[data-type*="select-multiple"],
+.choices[data-type*="text"] {
+
+  .choices__button_joomla {
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: block;
+    width: 0.5rem;
+    padding: 0.8125rem;
+    height: 1.625rem;
+    line-height: 2;
+    border: 0;
+    opacity: 1;
+    background-color: rgba(0, 0, 0, .2);
+    border-radius: 0 20px 20px 0;
+
+    &:hover,
+    &:focus {
+      opacity: 1;
+    }
+
+    &::before {
+      color: $white;
+    }
+  }
+
+  .choices__inner {
+    padding: 0.4rem 1rem 0.256rem;
+  }
+  .choices__input {
+    padding: 0.2rem 0 0.356rem;
+    color: $custom-select-color;
+  }
+}
+
+.choices__list--multiple .choices__item {
+  position: relative;
+  background-color: var(--atum-bg-dark);
+  border: 1px solid var(--atum-bg-dark);
+  border-radius: 0;
+
+  &.is-highlighted {
+    background-color: var(--atum-bg-dark);
+    border: 1px solid var(--atum-bg-dark);
+    opacity: 0.9;
+  }
+
+  &[data-deletable] {
+    padding-right: 1.8125rem;
+  }
+}
+
+.choices__input {
+  margin-bottom: 0;
+  padding: 0;
+  font-size: 1rem;
+}
+
+.choices__inner, .choices__input {
+  background-color: var(--white);
+}
+
+.choices__list--single {
+  padding: 0;
+  font-size: 1rem;
+  color: var(--atum-text-dark);
+}
+
+.choices__list--multiple .choices__item[data-deletable] {
+  padding-right: 1.8125rem !important;
+}
+
diff --git a/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss b/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss
new file mode 100644
index 0000000000000..b309f4334081b
--- /dev/null
+++ b/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss
@@ -0,0 +1,16 @@
+// Override the font path
+$fa-font-path: "../../../../../../media/vendor/fontawesome-free/webfonts" !default;
+
+
+// Font Awesome 5 Free
+@import "../../../../../../media/vendor/fontawesome-free/scss/solid";
+@import "../../../../../../media/vendor/fontawesome-free/scss/brands";
+@import "../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
+
+// B/C for Icomoon
+@import "../../../../../../build/media_source/system/scss/icomoon";
+
+// RTL override
+html[dir=rtl] .pull-right {
+  float: left;
+}
diff --git a/administrator/templates/atum/scss/blocks/_system-message.scss b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
similarity index 85%
rename from administrator/templates/atum/scss/blocks/_system-message.scss
rename to administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
index 09b8f1a55a0b1..44bf15559240f 100644
--- a/administrator/templates/atum/scss/blocks/_system-message.scss
+++ b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
@@ -1,3 +1,16 @@
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
+
+// Atum Variables
+@import "../../variables";
+
+// Mixins
+@import "../../mixin";
+
+@import "../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../media/vendor/bootstrap/scss/mixins";
+
+@import "../../../../../../node_modules/joomla-ui-custom-elements/dist/css/joomla-alert";
+
 #system-message-container {
   background: var(--atum-bg-light);
   box-shadow: 3px 3px 11px 0px rgba(0, 0, 0, 0.3);
@@ -25,7 +38,7 @@
 
     &[type="success"] {
       border-color: var(--success);
-     .alert-heading {
+      .alert-heading {
         background: var(--success);
       }
       hr {
@@ -109,4 +122,4 @@ html[dir=rtl] #system-message-container joomla-alert {
     right: auto;
     left: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/administrator/templates/atum/scss/blocks/_tabs.scss b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
similarity index 93%
rename from administrator/templates/atum/scss/blocks/_tabs.scss
rename to administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
index 0542d8011d062..0a1580303283c 100644
--- a/administrator/templates/atum/scss/blocks/_tabs.scss
+++ b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
@@ -1,3 +1,14 @@
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
+
+// Atum Variables
+@import "../../variables";
+
+// Mixins
+@import "../../mixin";
+
+@import "../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../media/vendor/bootstrap/scss/mixins";
+
 // Tabs
 
 
diff --git a/administrator/templates/atum/scss/vendor/_minicolors.scss b/administrator/templates/atum/scss/vendor/minicolors/minicolors.scss
similarity index 64%
rename from administrator/templates/atum/scss/vendor/_minicolors.scss
rename to administrator/templates/atum/scss/vendor/minicolors/minicolors.scss
index 2aade5e9ecae7..2f7a57f317052 100644
--- a/administrator/templates/atum/scss/vendor/_minicolors.scss
+++ b/administrator/templates/atum/scss/vendor/minicolors/minicolors.scss
@@ -1,4 +1,5 @@
 // Minicolours
+@import '../../../../../../node_modules/@claviska/jquery-minicolors/jquery.minicolors';
 
 .minicolors-theme-bootstrap {
 
diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.es6.js
index 3ab11d041667b..1e53ac07ba8a3 100644
--- a/build/build-modules-js/compilecss.es6.js
+++ b/build/build-modules-js/compilecss.es6.js
@@ -46,6 +46,12 @@ 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/vendor/awesomplete/awesomplete.scss`,
+          `${RootPath}/administrator/templates/atum/scss/vendor/choicesjs/choices.scss`,
+          `${RootPath}/administrator/templates/atum/scss/vendor/minicolors/minicolors.scss`,
+          `${RootPath}/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss`,
+          `${RootPath}/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss`,
+          `${RootPath}/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss`,
           `${RootPath}/installation/template/scss/template.scss`,
           `${RootPath}/installation/template/scss/template-rtl.scss`,
         ];
diff --git a/build/media_source/system/scss/_icomoon.scss b/build/media_source/system/scss/_icomoon.scss
index 99d617df9a9ed..cc99e4c6177d0 100644
--- a/build/media_source/system/scss/_icomoon.scss
+++ b/build/media_source/system/scss/_icomoon.scss
@@ -15,7 +15,7 @@
 }
 [class^="icon-"].disabled,
 [class*=" icon-"].disabled {
-    font-weight: normal;
+    font-weight: 900;
 }
 
 .icon-generic::before {