diff --git a/administrator/components/com_config/tmpl/application/default.php b/administrator/components/com_config/tmpl/application/default.php
index ec1ad11dc47a5..13dc38079688c 100644
--- a/administrator/components/com_config/tmpl/application/default.php
+++ b/administrator/components/com_config/tmpl/application/default.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Registry\Registry;
+use Joomla\CMS\Layout\LayoutHelper;
 
 // Load tooltips behavior
 HTMLHelper::_('behavior.formvalidator');
@@ -48,6 +49,9 @@
 		<!-- End Sidebar -->
 		<!-- Begin Content -->
 		<div class="col-md-10">
+		
+			<?php echo LayoutHelper::render('joomla.searchtools.filter_options', array('view' => $this)); ?>
+			
 			<ul class="nav nav-tabs">
 
 				<li class="nav-item"><a class="nav-link active" href="#page-site" data-toggle="tab"><?php echo Text::_('JSITE'); ?></a></li>
diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php
index 8cf04a3bdf69d..6b9cacecd6966 100644
--- a/administrator/components/com_config/tmpl/component/default.php
+++ b/administrator/components/com_config/tmpl/component/default.php
@@ -12,6 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Layout\LayoutHelper;
 
 defined('_JEXEC') or die;
 
@@ -44,7 +45,9 @@
 		<?php // End Sidebar ?>
 
 		<div class="col-md-10" id="config">
-
+		
+			<?php echo LayoutHelper::render('joomla.searchtools.filter_options', array('view' => $this)); ?>
+		
 			<?php if ($this->fieldsets): ?>
 			<ul class="nav nav-tabs" id="configTabs">
 				<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
diff --git a/administrator/components/com_users/forms/user.xml b/administrator/components/com_users/forms/user.xml
index 11de26f71648d..b68cb2759a393 100644
--- a/administrator/components/com_users/forms/user.xml
+++ b/administrator/components/com_users/forms/user.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="user_details">
-		<field 
-			name="name" 
+		<field
+			name="name"
 			type="text"
 			label="COM_USERS_USER_FIELD_NAME_LABEL"
 			required="true"
 			size="30"
 		/>
 
-		<field 
+		<field
 			name="username"
 			type="text"
 			label="COM_USERS_USER_FIELD_USERNAME_LABEL"
@@ -21,7 +21,7 @@
 			name="password"
 			type="password"
 			label="JGLOBAL_PASSWORD"
-			autocomplete="off"
+			autocomplete="new-password"
 			class="validate-password-strength"
 			filter="raw"
 			validate="password"
@@ -30,11 +30,11 @@
 			size="30"
 		/>
 
-		<field 
-			name="password2" 
+		<field
+			name="password2"
 			type="password"
 			label="COM_USERS_USER_FIELD_PASSWORD2_LABEL"
-			autocomplete="off"
+			autocomplete="new-password"
 			class="validate-passwordExtra"
 			filter="raw"
 			message="COM_USERS_USER_FIELD_PASSWORD1_MESSAGE"
@@ -50,6 +50,7 @@
 			required="true"
 			size="30"
 			validate="email"
+			validDomains="com_users.domains"
 		/>
 
 		<field
@@ -102,7 +103,7 @@
 			type="radio"
 			label="COM_USERS_USER_FIELD_SENDEMAIL_LABEL"
 			default="0"
-			class="switcher"
+			layout="joomla.form.field.radio.switcher"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
@@ -112,11 +113,11 @@
 			name="block"
 			type="radio"
 			label="COM_USERS_USER_FIELD_BLOCK_LABEL"
-			class="switcher switcher-danger"
+			layout="joomla.form.field.radio.switcher"
 			default="0"
 			>
-			<option value="0">COM_USERS_USER_FIELD_ENABLE</option>
 			<option value="1">COM_USERS_USER_FIELD_BLOCK</option>
+			<option value="0">COM_USERS_USER_FIELD_ENABLE</option>
 		</field>
 
 		<field
@@ -124,7 +125,7 @@
 			type="radio"
 			label="COM_USERS_USER_FIELD_REQUIRERESET_LABEL"
 			default="0"
-			class="switcher"
+			layout="joomla.form.field.radio.switcher"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
@@ -148,8 +149,8 @@
 		<!--  Basic user account settings. -->
 		<fieldset name="settings" label="COM_USERS_SETTINGS_FIELDSET_LABEL">
 
-			<field 
-				name="admin_style" 
+			<field
+				name="admin_style"
 				type="templatestyle"
 				label="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL"
 				client="administrator"
@@ -158,8 +159,8 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="admin_language" 
+			<field
+				name="admin_language"
 				type="language"
 				label="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL"
 				client="administrator"
@@ -167,8 +168,8 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="language" 
+			<field
+				name="language"
 				type="language"
 				label="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
 				client="site"
@@ -176,25 +177,17 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="editor" 
-				type="plugins" 
+			<field
+				name="editor"
+				type="plugins"
 				label="COM_USERS_USER_FIELD_EDITOR_LABEL"
 				folder="editors"
 				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="helpsite" 
-				type="helpsite"
-				label="COM_USERS_USER_FIELD_HELPSITE_LABEL"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
-			<field 
-				name="timezone" 
+			<field
+				name="timezone"
 				type="timezone"
 				label="COM_USERS_USER_FIELD_TIMEZONE_LABEL"
 				>
@@ -202,6 +195,51 @@
 			</field>
 
 		</fieldset>
+		<!-- User accessibility settings -->
+		<fieldset name="accessibility" label="COM_USERS_A11Y_SETTINGS_FIELDSET_LABEL">
+			<field
+				name="a11y_mono"
+				type="radio"
+				label="COM_USERS_A11Y_SETTINGS_FIELD_MONOCHROME"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				>
+				<option value="0">JNO</option>
+				<option value="monochrome">JYES</option>
+			</field>
+			<field
+				name="a11y_contrast"
+				type="radio"
+				label="COM_USERS_A11Y_SETTINGS_FIELD_CONTRAST"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				>
+				<option value="0">JNO</option>
+				<option value="high_contrast">JYES</option>
+			</field>
+			<field
+				name="a11y_highlight"
+				type="radio"
+				label="COM_USERS_A11Y_SETTINGS_FIELD_HIGHLIGHT"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				>
+				<option value="0">JNO</option>
+				<option value="highlight">JYES</option>
+			</field>
+			<field
+				name="a11y_font"
+				type="list"
+				label="COM_USERS_A11Y_SETTINGS_FIELD_FONTSIZE"
+				layout="joomla.form.field.list"
+				default="100">
+				<option value="80">80%</option>
+				<option value="90">90%</option>
+				<option value="100">100%</option>
+				<option value="110">110%</option>
+				<option value="125">125%</option>
+			</field>
+		</fieldset>
 
 	</fields>
 </form>
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 00466b05c74f0..bc3946a936ee7 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -899,6 +899,7 @@ JSEARCH_FILTER_SUBMIT="Search"
 JSEARCH_FILTER="Search"
 JSEARCH_TITLE="Search %s"
 JSEARCH_RESET="Reset"
+JSEARCH_TYPE_FILTER_TEXT="Type filter text"
 
 JTOGGLE_SIDEBAR_LABEL="Sidebar"
 JTOGGLE_HIDE_SIDEBAR="Hide the sidebar"
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index 00a5901a087fb..2049b8a24421a 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  Templates.Atum
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       4.0
  */
@@ -13,6 +13,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
 /** @var JDocumentHtml $this */
 
@@ -22,116 +23,155 @@
 $wa    = $this->getWebAssetManager();
 
 // Detecting Active Variables
-$option      = $input->get('option', '');
-$view        = $input->get('view', '');
-$layout      = $input->get('layout', '');
-$task        = $input->get('task', '');
-$itemid      = $input->get('Itemid', '');
-$cpanel      = $option === 'com_cpanel';
-$hidden      = $app->input->get('hidemainmenu');
-$logo        = $this->baseurl . '/templates/' . $this->template . '/images/logo.svg';
-$logoBlue    = $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg';
+$option     = $input->get('option', '');
+$view       = $input->get('view', '');
+$layout     = $input->get('layout', 'default');
+$task       = $input->get('task', 'display');
+$itemid     = $input->get('Itemid', '');
+$cpanel     = $option === 'com_cpanel';
+$hiddenMenu = $app->input->get('hidemainmenu');
+$joomlaLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo.svg';
+
+// Getting user accessibility settings
+$a11y_mono      = (bool) $app->getIdentity()->getParam('a11y_mono', '');
+$a11y_contrast  = (bool) $app->getIdentity()->getParam('a11y_contrast', '');
+$a11y_highlight = (bool) $app->getIdentity()->getParam('a11y_highlight', '');
+$a11y_font      = $app->getIdentity()->getParam('a11y_font', 100);
+
+require_once __DIR__ . '/Service/HTML/Atum.php';
+
+// Template params
+$siteLogo  = $this->params->get('siteLogo')
+	? Uri::root() . htmlspecialchars($this->params->get('siteLogo'), ENT_QUOTES)
+	: $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg';
+$smallLogo = $this->params->get('smallLogo')
+	? Uri::root() . htmlspecialchars($this->params->get('smallLogo'), ENT_QUOTES)
+	: $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg';
+
+$logoAlt = htmlspecialchars($this->params->get('altSiteLogo', ''), ENT_COMPAT, 'UTF-8');
+$logoSmallAlt = htmlspecialchars($this->params->get('altSmallLogo', ''), ENT_COMPAT, 'UTF-8');
 
 // Enable assets
-$wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
+$wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
+	->useStyle('template.active.language')
+	->useStyle('template.user');
 
-// Load specific language related CSS
-HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+// Override 'template.active' asset to set correct ltr/rtl dependency
+$wa->registerStyle('template.active', '', [], [], ['template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]);
 
 // Set some meta data
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');
 // @TODO sync with _variables.scss
 $this->setMetaData('theme-color', '#1c3d5c');
 
-$this->addScriptDeclaration('cssVars();');
+$monochrome = (bool) $this->params->get('monochrome');
+
+HTMLHelper::getServiceRegistry()->register('atum', 'JHtmlAtum');
+HTMLHelper::_('atum.rootcolors', $this->params);
 
 ?>
 <!DOCTYPE html>
-<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"<?php echo (int)$a11y_font != 100 ? ' class="a11y_font_'.(int)$a11y_font.'"' : ''; ?>>
 <head>
 	<jdoc:include type="metas" />
 	<jdoc:include type="styles" />
-	<jdoc:include type="scripts" />
 </head>
 
-<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task . ' itemid-' . $itemid; ?>">
-
-	<noscript>
-		<div class="alert alert-danger" role="alert">
-			<?php echo Text::_('JGLOBAL_WARNJAVASCRIPT'); ?>
-		</div>
-	</noscript>
-
-	<?php // Header ?>
-	<header id="header" class="header">
-		<div class="d-flex align-items-center">
-			<div class="header-title d-flex mr-auto">
-				<div class="d-flex">
-					<a class="logo" href="<?php echo Route::_('index.php'); ?>" aria-label="<?php echo Text::_('TPL_BACK_TO_CONTROL_PANEL'); ?>">
-						<img src="<?php echo $logoBlue; ?>" alt="">
+<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ($task ? ' task-' . $task : '') . ($monochrome || $a11y_mono ? ' monochrome' : '') . ($a11y_contrast ? ' a11y_contrast' : '') . ($a11y_highlight ? ' a11y_highlight' : ''); ?>">
+<noscript>
+	<div class="alert alert-danger" role="alert">
+		<?php echo Text::_('JGLOBAL_WARNJAVASCRIPT'); ?>
+	</div>
+</noscript>
+
+<jdoc:include type="modules" name="customtop" style="none" />
+
+<?php // Header ?>
+<header id="header" class="header">
+	<div class="d-flex">
+		<div class="header-title d-flex">
+			<div class="d-flex align-items-center">
+				<?php // No home link in edit mode (so users can not jump out) and control panel (for a11y reasons) ?>
+				<?php if ($hiddenMenu || $cpanel) : ?>
+					<div class="logo">
+					<img src="<?php echo $siteLogo; ?>" alt="<?php echo $logoAlt; ?>">
+					<img class="logo-small" src="<?php echo $smallLogo; ?>" alt="<?php echo $logoSmallAlt; ?>">
+					</div>
+				<?php else : ?>
+					<a class="logo" href="<?php echo Route::_('index.php'); ?>"
+						aria-label="<?php echo Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'); ?>">
+						<img src="<?php echo $siteLogo; ?>" alt="">
+						<img class="logo-small" src="<?php echo $smallLogo; ?>" alt="">
 					</a>
-				</div>
-				<jdoc:include type="modules" name="title" />
-			</div>
-			<div class="header-items d-flex ml-auto">
-				<jdoc:include type="modules" name="status" style="no" />
+				<?php endif; ?>
 			</div>
+			<jdoc:include type="modules" name="title" />
 		</div>
-	</header>
-
-	<?php // Wrapper ?>
-	<div id="wrapper" class="d-flex wrapper<?php echo $hidden ? '0' : ''; ?>">
-
-		<?php // Sidebar ?>
-		<?php if (!$hidden) : ?>
-		<div id="sidebar-wrapper" class="sidebar-wrapper" <?php echo $hidden ? 'data-hidden="' . $hidden . '"' : ''; ?>>
-			<jdoc:include type="modules" name="menu" style="none" />
-			<div id="main-brand" class="main-brand d-flex align-items-center justify-content-center">
-				<img src="<?php echo $logo; ?>" alt="">
-			</div>
+		<div class="header-items d-flex">
+			<jdoc:include type="modules" name="status" style="header-item" />
 		</div>
-		<?php endif; ?>
-
-		<?php // container-fluid ?>
-		<div class="container-fluid container-main">
-			<?php if (!$cpanel) : ?>
-				<?php // Subheader ?>
-				<a class="btn btn-subhead d-md-none d-lg-none d-xl-none" data-toggle="collapse" data-target=".subhead-collapse"><?php echo Text::_('TPL_ATUM_TOOLBAR'); ?>
-					<span class="icon-wrench"></span></a>
-				<div id="subhead" class="subhead">
-						<div id="container-collapse" class="container-collapse"></div>
-						<div class="row">
-							<div class="col-md-12">
-								<jdoc:include type="modules" name="toolbar" style="no" />
-							</div>
-					</div>
+	</div>
+</header>
+
+<?php // Wrapper ?>
+<div id="wrapper" class="d-flex wrapper<?php echo $hiddenMenu ? '0' : ''; ?>">
+	<?php // Sidebar ?>
+	<?php if (!$hiddenMenu) : ?>
+		<button class="navbar-toggler toggler-burger collapsed" type="button" data-toggle="collapse" data-target="#sidebar-wrapper" aria-controls="sidebar-wrapper" aria-expanded="false" aria-label="Toggle navigation">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+
+		<div id="sidebar-wrapper" class="sidebar-wrapper sidebar-menu" <?php echo $hiddenMenu ? 'data-hidden="' . $hiddenMenu . '"' : ''; ?>>
+			<div id="sidebarmenu">
+				<div class="sidebar-toggle item item-level-1">
+					<a id="menu-collapse" href="#" aria-label="<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>">
+						<span id="menu-collapse-icon" class="fas fa-toggle-off fa-fw" aria-hidden="true"></span>
+						<span class="sidebar-item-title"><?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?></span>
+					</a>
 				</div>
-			<?php endif; ?>
-			<section id="content" class="content">
-				<?php // Begin Content ?>
-				<jdoc:include type="modules" name="top" style="xhtml" />
+				<jdoc:include type="modules" name="menu" style="none" />
+			</div>
+		</div>
+	<?php endif; ?>
+
+	<?php // container-fluid ?>
+	<div class="container-fluid container-main">
+		<?php if (!$cpanel) : ?>
+			<?php // Subheader ?>
+			<button class="navbar-toggler toggler-toolbar toggler-burger collapsed" type="button" data-toggle="collapse" data-target=".subhead" aria-controls="subhead" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOOLBAR'); ?>">
+				<span class="toggler-toolbar-icon"></span>
+			</button>
+			<div id="subhead" class="subhead mb-3">
+				<div id="container-collapse" class="container-collapse"></div>
 				<div class="row">
 					<div class="col-md-12">
-						<main>
-							<jdoc:include type="component" />
-						</main>
+						<jdoc:include type="modules" name="toolbar" style="no" />
 					</div>
-					<?php if ($this->countModules('bottom')) : ?>
-						<jdoc:include type="modules" name="bottom" style="xhtml" />
-					<?php endif; ?>
 				</div>
-				<?php // End Content ?>
-			</section>
-
-			<div class="notify-alerts">
-				<jdoc:include type="message" />
 			</div>
+		<?php endif; ?>
+		<section id="content" class="content">
+			<?php // Begin Content ?>
+			<jdoc:include type="modules" name="top" style="xhtml" />
+			<div class="row">
+				<div class="col-md-12">
+					<main>
+						<jdoc:include type="component" />
+					</main>
+				</div>
+				<?php if ($this->countModules('bottom')) : ?>
+					<jdoc:include type="modules" name="bottom" style="xhtml" />
+				<?php endif; ?>
+			</div>
+			<?php // End Content ?>
+		</section>
 
+		<div class="notify-alerts">
+			<jdoc:include type="message" />
 		</div>
-
 	</div>
-
-	<jdoc:include type="modules" name="debug" style="none" />
-
+</div>
+<jdoc:include type="modules" name="debug" style="none" />
+<jdoc:include type="scripts" />
 </body>
 </html>
diff --git a/administrator/templates/atum/scss/blocks/_global.scss b/administrator/templates/atum/scss/blocks/_global.scss
index ea2c6f03abe6f..ecf04c2489f47 100644
--- a/administrator/templates/atum/scss/blocks/_global.scss
+++ b/administrator/templates/atum/scss/blocks/_global.scss
@@ -1,14 +1,40 @@
 // Global
 
-html,
-body {
+html {
   height: 100%;
-  font-size: $font-size-root;
+  &.a11y_font_80 {font-size: 80%;}
+  &.a11y_font_90 {font-size: 90%;}
+  &.a11y_font_110 {font-size: 110%;}
+  &.a11y_font_125 {font-size: 125%;}
 }
 
 body {
+  min-height: 100%;
+  display: flex;
+  flex-direction: column;
   padding: 0;
   margin: 0;
+  text-align: start;
+
+  &.monochrome {
+    filter: grayscale(1);
+  }
+
+  &.a11y_contrast {
+    filter: contrast(115%);
+  }
+
+  &.monochrome.a11y_contrast {
+    filter: grayscale(1) contrast(115%);
+  }
+
+  &.a11y_highlight {
+    a {
+      padding: 3px;
+      text-decoration: underline !important;
+      border: #f00 dotted 1px;
+    }
+  }
 }
 
 h1,
@@ -17,11 +43,11 @@ h3,
 h4,
 h5,
 h6 {
-  font-weight: $bold-weight;
+  font-weight: $font-weight-bold;
 }
 
 h1 {
-  font-weight: $normal-weight;
+  font-weight: $font-weight-normal;
 }
 
 small,
@@ -31,11 +57,10 @@ small,
 
 legend {
   font-size: 1.2rem;
-  font-weight: $bold-weight;
-  ;
+  font-weight: $font-weight-bold;
 }
 
-// focus-visible polyfil rule
+// focus-visible polyfill rule
 .js-focus-visible :focus:not(.focus-visible) {
   outline: none;
 }
@@ -46,13 +71,151 @@ button,
 input,
 textarea {
 
-  &:focus,
-  &:-moz-focusring {
+  &.focus-visible {
     outline: auto 2px var(--focus);
   }
 }
+
 // Break up text in cells to prevent overflow
 .break-word {
   word-break: break-all;
   word-wrap: break-word;
 }
+
+label,
+caption {
+  font-size: $label-font-size;
+}
+
+.logo {
+
+  img path {
+    fill: var(--atum-text-dark);
+  }
+}
+
+.container-main,
+.system-debug {
+  padding-bottom: 50px;
+}
+
+body .container-main {
+  position: relative;
+  padding-right: 0;
+  padding-left: 0;
+
+  &::before,
+  &::after {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: -1;
+    width: 100%;
+    height: 100%;
+    content: "";
+    // 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;
+  }
+
+  &::after {
+    background: linear-gradient(135deg, var(--atum-bg-light) 0%, var(--atum-bg-light) 20%, rgba(225, 229, 231, 0) 100%);
+  }
+}
+
+
+.content {
+  padding: 2vw;
+  border-radius: $border-radius;
+
+  > .row {
+    margin-right: 0;
+    margin-left: 0;
+  }
+
+  .subhead + & {
+    padding-top: 0;
+  }
+}
+
+.row-selected {
+  background-color: var(--toolbar-bg);
+}
+
+// Chosen (TEMPORARY)
+.chzn-container-single {
+  width: auto !important;
+}
+
+// Multiple buttons wrapping
+.input-group input {
+  min-width: 220px;
+}
+
+// Multilingual associations specific
+.item-associations {
+  padding: 0;
+}
+
+.item-associations li {
+  display: inline-block;
+  list-style: none;
+}
+
+// Quickicon specific
+.message-alert {
+  text-align: end !important;
+}
+
+// extern links with icons
+a[target="_blank"]::before {
+  font: normal normal normal 14px/1 'Font Awesome 5 Free';
+  content: "\f35d  ";
+}
+
+#wrapper {
+  &.d-flex {
+    @include media-breakpoint-down(xs) {
+      display: block !important;
+    }
+  }
+}
+
+.text-muted {
+  color: var(--atum-text-dark);
+}
+
+.card-columns {
+  display: grid;
+  grid-gap: 0 15px;
+  grid-template-columns: 1fr;
+
+  @include media-breakpoint-up(md) {
+    grid-template-columns: 1fr 1fr;
+  }
+}
+
+.cpanel-help,
+.cpanel-system {
+
+  .card-columns {
+    @include media-breakpoint-up(md) {
+      grid-template-columns: 1fr 1fr 1fr;
+    }
+  }
+}
+
+.tiny {
+  font-size: $font-size-vsm;
+  line-height: 1.4rem;
+}
+
+// details
+
+details {
+  margin: 0 0 2rem;
+}
+
+summary {
+  color: var(--atum-link-color);
+}
diff --git a/build/media_src/com_config/css/filter-options.css b/build/media_src/com_config/css/filter-options.css
new file mode 100644
index 0000000000000..0a6319c291a53
--- /dev/null
+++ b/build/media_src/com_config/css/filter-options.css
@@ -0,0 +1,15 @@
+#config-document .filter-options-col {
+	float:left;
+	flex: none;
+	max-width: 100%;
+}
+#config-document .filter-options-col:empty {
+	display:none;
+}
+
+#config-document  .filter-options-fieldset {
+	float: left;
+}
+#config-document  .filter-options-fieldset:empty {
+	display:none;
+}
diff --git a/build/media_src/com_config/js/config-filter-options.es6.js b/build/media_src/com_config/js/config-filter-options.es6.js
new file mode 100644
index 0000000000000..3baebcd595817
--- /dev/null
+++ b/build/media_src/com_config/js/config-filter-options.es6.js
@@ -0,0 +1,128 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+ 
+document.addEventListener("DOMContentLoaded", () => { 
+  	
+	function filterOptionsQuote(str) {
+		return str.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+	};
+	
+	function filterOptions(str) {
+		
+		let hideElements 		= '.tab-pane .alert, .tab-pane .field-spacer, fieldset legend, #sendtestmail, .tab-description';
+		let hideElementBoxes	= '.tab-header';
+		let tab 				= '#configTabs li a, .nav-tabs li a';
+		let tabContent			= '#configContent div.tab-pane, #config-document div.tab-pane';
+		let excludeTabs			= '#page-filters, #page-permissions, #permissions';
+		let itemParameter		= '.control-group .control-label label';
+		let itemParameterBox	= '.control-group';
+		let tabRow				= '.tab-pane .row div';
+		let tabFieldset			= '.tab-pane .row div fieldset';
+		
+		/* J39
+		tab 					= '#configTabs li, .nav-tabs li';
+		tabRow					= '.tab-pane .row-fluid div';
+		tabFieldset				= '.tab-pane .row-fluid div fieldset';
+		*/
+		
+		if (str.length > 0) {
+			
+			/* Make tabs disabled */
+			document.querySelectorAll(tab).forEach((elem) => {
+				elem.classList.add('disabled'),
+				elem.classList.remove('active'),
+				elem.classList.remove('show')
+			});
+			/* Make all tab contents active so they can be searched */
+			document.querySelectorAll(tabContent).forEach((elem) => {elem.classList.add('active')});
+			/* Hide some specific parts which are not neccessary to display in search results */
+			document.querySelectorAll(hideElements).forEach((elem) => {elem.style.display = "none";});
+			/* Hide boxes of specific parts which are not neccessary to display in search results */
+			document.querySelectorAll(hideElementBoxes).forEach((elem) => {elem.parentElement.parentElement.style.display = "none";});
+			/* Hide tab items which cannot be filtered */
+			document.querySelectorAll(excludeTabs).forEach((elem) => {
+				elem.classList.add('disabled'),
+				elem.classList.remove('active'),
+				elem.classList.remove('show')
+			});
+			
+			
+			/* Cancel columns in Global Configuration */
+			document.querySelectorAll(tabRow).forEach((elem) => {elem.classList.add('filter-options-col')});
+			document.querySelectorAll(tabFieldset).forEach((elem) => {elem.classList.add('filter-options-fieldset')});
+			
+			/* Foreach each item and check if it fits criteria. If yes, display it */
+			document.querySelectorAll(itemParameter).forEach((elem) => {
+				let ePP	= elem.parentElement.parentElement;
+				let item = elem.innerHTML;
+				ePP.style.display = "none";
+			
+				if (item && typeof item == "string") {
+					let re = new RegExp(filterOptionsQuote(str), "i");
+					let res = item.match(re);
+					
+					if (res) {
+						ePP.style.display = "block";
+					}
+				}
+			});
+			return;
+		} 
+		
+		/* Remove disabled class from all tabs */
+		document.querySelectorAll(tab).forEach((elem) => {
+			elem.classList.remove('disabled'),
+			elem.classList.remove('active'),
+			elem.classList.remove('show')
+		});
+		
+		/* Make first tab in active */
+		if(document.querySelector(tab)) {
+			document.querySelector(tab).classList.add('active');
+			document.querySelector(tab).classList.add('show');
+		}
+		
+		/* Remove active class from all tab contents */
+		document.querySelectorAll(tabContent).forEach((elem) => {
+			elem.classList.remove('active'),
+			elem.classList.remove('show')
+		});
+		
+		/* Make first tab CONTENT in global configuration options active */
+		if(document.querySelector(tabContent)) {
+			document.querySelector(tabContent).classList.add('active');
+			document.querySelector(tabContent).classList.add('show');
+		}
+		
+		/* Display all hidden parts back - undo the changes we've made when searching */
+		document.querySelectorAll(hideElements).forEach((elem) => {elem.style.display = "block";});
+		
+		/* Display all hidden boxex of parts back - undo the changes we've made when searching */ 
+		document.querySelectorAll(hideElementBoxes).forEach((elem) => {elem.parentElement.parentElement.style.display = "block";});
+		
+		/* Display all hidden paremter items back - undo the changes we've made when searching */
+		document.querySelectorAll(itemParameterBox).forEach((elem) => {elem.style.display = "block";});
+		
+		/* Display items which cannot be filtered - undo the changes we've made when searching */
+		document.querySelectorAll(excludeTabs).forEach((elem) => {elem.classList.remove('disabled')});
+		
+		/* Cancel canceling of columns ( :-) ) in Global Configuration */
+		document.querySelectorAll(tabRow).forEach((elem) => {elem.classList.remove('filter-options-col')});
+		document.querySelectorAll(tabFieldset).forEach((elem) => {elem.classList.remove('filter-options-fieldset')});
+		
+	}
+
+	
+	/* Events */
+	document.getElementById("filterOptionsClear").addEventListener("click", (event) => {
+		document.getElementById("filterOptionsInput").value = "";
+		filterOptions("");
+	})
+	
+	document.getElementById("filterOptionsInput").addEventListener("input", (event) => {
+		let eV = event.currentTarget.value;
+		filterOptions(eV);
+	});
+});
\ No newline at end of file
diff --git a/layouts/joomla/searchtools/filter_options.php b/layouts/joomla/searchtools/filter_options.php
new file mode 100644
index 0000000000000..24d6f0bfe6078
--- /dev/null
+++ b/layouts/joomla/searchtools/filter_options.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+
+$data = $displayData;
+
+// TODO include comprimed js
+HTMLHelper::_('script', 'com_config/config-filter-options.min.js', ['relative' => true, 'version' => 'auto']);
+HTMLHelper::_('stylesheet', 'com_config/filter-options.min.css', array('version' => 'auto', 'relative' => true));
+?><div class="js-stools" role="search">
+	<div class="js-stools-container-bar">
+		<div class="btn-toolbar">
+			<div class="btn-group mr-2">
+				<div class="input-group">
+					<label for="filter_search" class="sr-only">
+						<?php echo Text::_('JSEARCH_TYPE_FILTER_TEXT'); ?>
+					</label>
+					<input type="text" name="filterOptionsInput" id="filterOptionsInput" value="" class="form-control" title="<?php echo Text::_('JSEARCH_TYPE_FILTER_TEXT'); ?>" placeholder="<?php echo Text::_('JSEARCH_TYPE_FILTER_TEXT'); ?>">
+					<?php /*><span class="input-group-append">
+						<button type="submit" class="btn btn-primary hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>"  aria-label="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
+							<span class="fa fa-search" aria-hidden="true"></span>
+						</button>
+					</span> */ ?>
+				</div>
+			</div>
+			<button type="button" name="filterOptionsClear" id="filterOptionsClear" class="btn btn-primary hasTooltip js-stools-btn-clear mr-2" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>">
+				<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>
+			</button>
+		</div>
+	</div>
+</div>
\ No newline at end of file