diff --git a/composer.json b/composer.json
index c723061c97..8aff69068f 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
         "drupal/acquia_cms_toolbar": "dev-develop",
         "drupal/acquia_cms_tour": "dev-develop",
         "drupal/consumer_image_styles": "^4.0",
+        "drupal/gin": "^3.0",
         "drupal/google_analytics": "^4.0",
         "drupal/google_tag": "^2.0",
         "drupal/honeypot": "^2.1",
diff --git a/composer.lock b/composer.lock
index 8e8cb727b7..e97480509f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7791dff897df75d283973bdff1b657cb",
+    "content-hash": "eafce796815f1d9000fb07e18cc5bb37",
     "packages": [
         {
             "name": "acquia/acquia-cms-starterkit",
@@ -2384,7 +2384,7 @@
             "dist": {
                 "type": "path",
                 "url": "./modules/acquia_cms_common",
-                "reference": "9ef9852585a577370e51197a95d524d4d50562f2"
+                "reference": "565c5b8c0abb97b30d7693d229d1659ede2c84fa"
             },
             "require": {
                 "acquia/drupal-environment-detector": "^1.5",
@@ -2400,7 +2400,6 @@
                 "drupal/diff": "^1.1",
                 "drupal/entity_clone": "^2.0@beta",
                 "drupal/field_group": "^3.4",
-                "drupal/gin": "^3.0@RC",
                 "drupal/memcache": "^2.5",
                 "drupal/moderation_dashboard": "^2.1",
                 "drupal/moderation_sidebar": "^1.7",
@@ -2912,12 +2911,15 @@
             "dist": {
                 "type": "path",
                 "url": "./modules/acquia_cms_toolbar",
-                "reference": "ff8fe4ffb2b7c0d87aaeecc8c4626ea79c93a433"
+                "reference": "08ae5d1f2169d567dd9f660dfccea4e27316016d"
             },
             "require": {
                 "drupal/acquia_cms_common": "1.x-dev || 2.x-dev || 3.x-dev",
                 "drupal/admin_toolbar": "^3.3"
             },
+            "conflict": {
+                "drupal/acquia_claro": "<1.4"
+            },
             "type": "drupal-module",
             "extra": {
                 "branch-alias": {
diff --git a/modules/acquia_cms_common/acquia_cms_common.install b/modules/acquia_cms_common/acquia_cms_common.install
index 8bf714a865..f824917d2f 100644
--- a/modules/acquia_cms_common/acquia_cms_common.install
+++ b/modules/acquia_cms_common/acquia_cms_common.install
@@ -15,8 +15,9 @@ use Drupal\workbench_email\Entity\Template;
  * Implements hook_install().
  */
 function acquia_cms_common_install($is_syncing) {
-  $module_handler = \Drupal::moduleHandler();
   if (!$is_syncing) {
+    $module_handler = \Drupal::moduleHandler();
+    $module_installer = \Drupal::service('module_installer');
     _acquia_cms_common_import_configurations();
     user_role_grant_permissions('anonymous', [
       'access content',
@@ -27,12 +28,21 @@ function acquia_cms_common_install($is_syncing) {
       'view media',
     ]);
 
-    // Enable olivero, gin theme.
-    $theme_installer = \Drupal::service('theme_installer');
-    $theme_installer->install(["olivero", "gin"]);
+    // Get all available themes.
+    $themes_list = \Drupal::service('extension.list.theme')->getList();
+    $themes_install = ["olivero"];
+    if (isset($themes_list['gin'])) {
+      $themes_install[] = "gin";
+    }
+    // Enable themes.
+    \Drupal::service('theme_installer')->install($themes_install);
     $system_theme_config = \Drupal::configFactory()->getEditable('system.theme');
     $system_theme_config->set('default', 'olivero')->save();
-    $system_theme_config->set('admin', "gin")->save();
+    if (in_array("gin", $themes_install)) {
+      $system_theme_config->set('admin', "gin")->save();
+      // Enable gin_toolbar module.
+      $module_installer->install(['gin_toolbar']);
+    }
 
     // Re-write the content and media view on module install,
     // since we have moved this config in optional directory.
@@ -56,7 +66,6 @@ function acquia_cms_common_install($is_syncing) {
     $config->set('enable_export_filtering', TRUE);
     $config->save(TRUE);
 
-    $module_installer = \Drupal::service('module_installer');
     if ($module_handler->moduleExists('page_cache')) {
       // Uninstall page_cache module in favour of memcache.
       $module_installer->uninstall(['page_cache']);
@@ -299,22 +308,3 @@ function acquia_cms_common_update_8009() {
     }
   }
 }
-
-/**
- * Implements hook_update_N().
- *
- * Enable Gin and set as admin theme is current admin theme is Acquia Claro.
- */
-function acquia_cms_common_update_8301() {
-  $config = \Drupal::configFactory()->getEditable('system.theme');
-  if ($config) {
-    if ($config->get('admin') == 'acquia_claro') {
-      $themes_list = \Drupal::service('extension.list.theme')->getList();
-      $theme_installer = \Drupal::service('theme_installer');
-      if (isset($themes_list['gin'])) {
-        $theme_installer->install(["gin"]);
-        $config->set('admin', "gin")->save();
-      }
-    }
-  }
-}
diff --git a/modules/acquia_cms_common/composer.json b/modules/acquia_cms_common/composer.json
index 3a0e8575c5..0ee26bb798 100644
--- a/modules/acquia_cms_common/composer.json
+++ b/modules/acquia_cms_common/composer.json
@@ -17,7 +17,6 @@
         "drupal/diff": "^1.1",
         "drupal/entity_clone": "^2.0@beta",
         "drupal/field_group": "^3.4",
-        "drupal/gin": "^3.0@RC",
         "drupal/memcache": "^2.5",
         "drupal/moderation_dashboard": "^2.1",
         "drupal/moderation_sidebar": "^1.7",
diff --git a/modules/acquia_cms_toolbar/composer.json b/modules/acquia_cms_toolbar/composer.json
index ca4ff9b0f3..4b88bdc7cc 100644
--- a/modules/acquia_cms_toolbar/composer.json
+++ b/modules/acquia_cms_toolbar/composer.json
@@ -7,6 +7,9 @@
         "drupal/acquia_cms_common": "1.x-dev || 2.x-dev || 3.x-dev",
         "drupal/admin_toolbar": "^3.3"
     },
+    "conflict": {
+        "drupal/acquia_claro": "<1.4"
+    },
     "config": {
         "allow-plugins": {
             "composer/installers": true,
diff --git a/modules/acquia_cms_toolbar/css/acquia_cms_toolbar.css b/modules/acquia_cms_toolbar/css/acquia_cms_toolbar.css
index 596e2f918b..8040ccd2c8 100644
--- a/modules/acquia_cms_toolbar/css/acquia_cms_toolbar.css
+++ b/modules/acquia_cms_toolbar/css/acquia_cms_toolbar.css
@@ -1,669 +1,67 @@
-.acquia-cms-toolbar {
-  margin-top: 12px;
+.acquia-cms-toolbar #toolbar-administration .toolbar-bar {
+  margin-top: 10px !important;
 }
 
-.acquia-cms-toolbar .toolbar {
-  -webkit-box-shadow: -1px 0 3px 1px rgba(0, 0, 0, 0.3333);
-  box-shadow: -1px 0 3px 1px rgba(0, 0, 0, 0.3333);
-}
-
-.acquia-cms-toolbar .toolbar a {
-  font-family: "Proxima Nova", "Open Sans", "Helvetica Neue", sans-serif;
-  font-style: normal;
-  font-weight: bold;
-  -webkit-transition: all, 0.2s;
-  transition: all, 0.2s;
-  font-size: 14px;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar {
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  background-color: #222330 !important;
-  top: 10px;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar:before {
+.acquia-cms-toolbar #toolbar-administration .toolbar-bar:before {
   content: '';
   width: 100%;
-  top: -10px;
   position: absolute;
   height: 10px;
   left: 0;
+  top: -10px;
 }
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item {
-  background: transparent;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab > .toolbar-item.is-active {
-  background-color: rgba(255, 255, 255, 0.03);
-  background-image: none;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab > .toolbar-item:focus {
-  background-color: rgba(255, 255, 255, 0.03);
-  background-image: none;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment {
-  color: #ffffff;
-  width: auto;
-  padding-right: 12px;
-}
-
-@media only screen and (max-width: 767px) {
-  .acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment {
-    text-indent: 50px;
-  }
+.toolbar.toolbar-secondary .toolbar-bar .toolbar-tab .toolbar-icon-environment:before {
+  background-color: #fff !important;
 }
 
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment:before {
-  background-image: url(../images/acacac/env-ffffff.svg);
+.toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment:before {
+  background-image: url(../images/acacac/env-ffffff.svg) !important;
   max-width: 55px;
 }
 
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment:hover {
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-local,
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-ide {
-  background-color: #1078c2;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-local:focus,
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-ide:focus {
-  background: #1078c2;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-dev {
-  background-color: #498414;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-dev:focus {
-  background: #498414;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-stage {
-  background-color: #feb32b;
-  color: #000000;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-stage:focus {
-  background: #feb32b;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-prod {
-  background-color: #cd3a3d;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-bar .toolbar-tab .toolbar-icon-environment.environment-prod:focus {
-  background: #feb32b;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu {
-  background: #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle:before {
-  background-image: url(../images/acacac/chevron-outline-disc-down.svg);
-  background-size: 100%;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle:hover:before {
-  background-image: url(../images/168ec4/chevron-outline-disc-down.svg);
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle.open:before {
-  background-image: url(../images/168ec4/chevron-outline-disc-close.svg);
-  background-size: 100%;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu .toolbar-menu a {
-  color: #545560;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu .toolbar-menu a:hover {
-  color: #168ec4;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu .toolbar-box:hover .toolbar-icon.toolbar-handle:before {
-  background-image: url(../images/168ec4/chevron-outline-disc-down.svg);
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-menu .toolbar-box:hover .toolbar-icon.toolbar-handle.open:before {
-  background-image: url(../images/168ec4/chevron-outline-disc-close.svg);
-  background-size: 100%;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-horizontal {
-  -webkit-box-shadow: -2px 1px 3px 1px rgba(0, 0, 0, 0.3333);
-  box-shadow: -2px 1px 3px 1px rgba(0, 0, 0, 0.3333);
-  border-bottom: 1px solid #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-horizontal ul ul li.menu-item:first-child {
-  border: none;
-  border-top: 1px solid #168ec4;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-horizontal .menu-item + .menu-item {
-  border-right: none;
-  border-left: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-horizontal .menu-item:last-child {
-  border-right: none;
-  border-left: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-horizontal .toolbar-toggle-orientation {
-  border: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-vertical {
-  -webkit-box-shadow: -2px 2px 12px rgba(0, 0, 0, 0.85);
-  box-shadow: -2px 2px 12px rgba(0, 0, 0, 0.85);
-  border: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-vertical .menu-item + .menu-item {
-  border: 0 none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-vertical .toolbar-menu a {
-  color: #545560;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-vertical .toolbar-menu a:hover {
-  color: #168ec4;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-vertical .toolbar-menu a:focus {
-  color: #168ec4;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray-vertical .toolbar-menu ul ul {
-  border: none;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray {
-  background-color: #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray .menu-item--active-trail > .toolbar-box a {
-  color: #168ec4;
-  text-decoration: none;
-  font-weight: bold;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-tray a.is-active {
-  color: #168ec4;
-  text-decoration: none;
-  font-weight: bold;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-toggle-orientation {
-  background-color: #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-icon.toolbar-handle > span {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-icon.toolbar-handle:focus {
-  background-color: transparent;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-icon.toolbar-handle:before {
-  background-image: url(../images/acacac/chevron-outline-disc-down.svg);
-  -webkit-transition: .25s;
-  transition: .25s;
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-icon.toolbar-handle:hover:before {
-  background-image: url(../images/168ec4/chevron-outline-disc-down.svg);
-}
-
-.acquia-cms-toolbar .toolbar .toolbar-icon.toolbar-handle.open:before {
-  background-image: url(../images/ffcfcf/chevron-outline-disc-close.svg) !important;
-  -webkit-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
-
-.acquia-cms-toolbar .toolbar .level-3 a {
-  color: #cccccc !important;
-}
-
-.acquia-cms-toolbar .toolbar .level-4 a {
-  color: #cccccc !important;
-}
-
-.acquia-cms-toolbar .toolbar .menu-item:hover {
-  background-color: #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar .menu-item--expanded {
-  background-color: #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar-tray .toolbar-menu a {
-  background: transparent;
-  color: #545560;
-}
-
-.acquia-cms-toolbar .toolbar-tray .toolbar-menu span {
-  background: transparent;
-  color: #545560;
-}
-
-.acquia-cms-toolbar .toolbar-tray .toolbar-menu li {
-  background: #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar-tray ul li.menu-item {
-  border: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray a {
-  color: #545560;
-}
-
-.acquia-cms-toolbar .toolbar-tray span {
-  display: block;
-  padding: 1em 1.3em;
-  color: #545560;
-}
-
-.acquia-cms-toolbar .toolbar-oriented .user-toolbar-tab {
-  float: right;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal a:hover {
-  color: #168ec4;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal a:active {
-  color: #168ec4;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal a:focus {
-  background: #ffffff;
-  color: #168ec4;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover > a {
-  color: #168ec4 !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover > .toolbar-box > a {
-  color: #168ec4 !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-admin-toolbar-tools-help:before {
-  background-image: url(../images/168ec4/drupal-9.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-system-admin-content:before {
-  background-image: url(../images/168ec4/file.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-system-admin-structure:before {
-  background-image: url(../images/168ec4/orgchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-system-themes-page:before {
-  background-image: url(../images/168ec4/paintbrush.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-entity-user-collection:before {
-  background-image: url(../images/168ec4/people.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-system-modules-list:before {
-  background-image: url(../images/168ec4/puzzlepiece.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-system-admin-config:before {
-  background-image: url(../images/168ec4/wrench.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item--expanded:hover .toolbar-icon-system-admin-reports:before {
-  background-image: url(../images/168ec4/barchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .menu-item a:focus {
-  background: #ffffff;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded {
-  position: relative;
-  background-image: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded > a:after {
-  position: absolute;
-  top: 50%;
-  right: 5px;
-  color: #8eacc0;
-  font-size: 16px;
-  -webkit-transform: translateY(-8px);
-  transform: translateY(-8px);
-  -webkit-transition: all .2s;
-  transition: all .2s;
-  content: url(../images/0084d7/chevron-right.svg);
-  pointer-events: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded > a:hover:after {
-  -webkit-transform: translate(6px, -8px);
-  transform: translate(6px, -8px);
-  content: url(../images/0084d7/chevron-right.svg);
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item:hover ul {
-  margin: -39px 0 0 200px;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item {
-  border-top: none transparent;
-  border-right: none;
-  border-bottom: none;
-  border-left: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal ul ul li li.menu-item:first-child {
-  border-top: none !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-horizontal .toolbar-menu ul .toolbar-icon {
-  padding: 1em 12px;
-}
-
-.acquia-cms-toolbar .level-1 .toolbar-handle.open {
-  background: #3b3b3b !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-vertical .level-2 {
-  background: #3b3b3b !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-vertical .level-3 {
-  background: #434343 !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-vertical .level-3 a {
-  padding-left: 2.75em !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-vertical .level-4 {
-  background: #4c4c4c !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-vertical .level-5 {
-  background: #545454 !important;
-}
-
-.acquia-cms-toolbar .toolbar-tray-vertical .toolbar-icon-admin-toolbar-tools-help {
-  text-indent: 0;
-  -webkit-transition: none;
-  transition: none;
-}
-
-.acquia-cms-toolbar .toolbar-tray-vertical .toolbar-icon-admin-toolbar-tools-help:before {
-  margin-left: 0;
-}
-
-.acquia-cms-toolbar .level-2 .toolbar-handle.open {
-  background: #434343 !important;
-}
-
-.acquia-cms-toolbar .level-3 .toolbar-handle.open {
-  background: #4c4c4c !important;
-}
-
-.acquia-cms-toolbar .level-4 .toolbar-handle.open {
-  background: #545454 !important;
-}
-
-.acquia-cms-toolbar .toolbar-handle.open {
-  border-top-left-radius: 10px;
-}
-
-.acquia-cms-toolbar .toolbar-box a:focus {
-  background: #ffffff;
-  text-decoration: none;
-}
-
-.acquia-cms-toolbar .toolbar-icon-admin-toolbar-tools-help:before {
-  padding: 0px;
-  margin-left: 7px;
-  background-image: url(../images/acacac/drupal-9.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-admin-toolbar-tools-help:hover:before {
-  background-image: url(../images/168ec4/drupal-9.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-admin-toolbar-tools-help:active:before {
-  background-image: url(../images/168ec4/drupal-9.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-content:before {
-  background-image: url(../images/acacac/file.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-content:hover:before {
-  background-image: url(../images/168ec4/file.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-content:active:before {
-  background-image: url(../images/168ec4/file.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-structure:before {
-  background-image: url(../images/acacac/orgchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-structure:hover:before {
-  background-image: url(../images/168ec4/orgchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-structure:active:before {
-  background-image: url(../images/168ec4/orgchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-themes-page:before {
-  background-image: url(../images/acacac/paintbrush.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-themes-page:hover:before {
-  background-image: url(../images/168ec4/paintbrush.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-themes-page:active:before {
-  background-image: url(../images/168ec4/paintbrush.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-entity-user-collection:before {
-  background-image: url(../images/acacac/people.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-entity-user-collection:hover:before {
-  background-image: url(../images/168ec4/people.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-entity-user-collection:active:before {
-  background-image: url(../images/168ec4/people.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-modules-list:before {
-  background-image: url(../images/acacac/puzzlepiece.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-modules-list:hover:before {
-  background-image: url(../images/168ec4/puzzlepiece.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-modules-list:active:before {
-  background-image: url(../images/168ec4/puzzlepiece.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-config:before {
-  background-image: url(../images/acacac/wrench.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-config:hover:before {
-  background-image: url(../images/168ec4/wrench.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-config:active:before {
-  background-image: url(../images/168ec4/wrench.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-reports:before {
-  background-image: url(../images/acacac/barchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-reports:hover:before {
-  background-image: url(../images/168ec4/barchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-reports:active:before {
-  background-image: url(../images/168ec4/barchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-help-main:before {
-  background-image: url(../images/acacac/questionmark-disc.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-help-main:hover:before {
-  background-image: url(../images/168ec4/questionmark-disc.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-help-main:active:before {
-  background-image: url(../images/168ec4/questionmark-disc.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-admin-toolbar-tools-help.is-active:before {
-  background-image: url(../images/168ec4/drupal-9.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-content.is-active:before {
-  background-image: url(../images/168ec4/file.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-structure.is-active:before {
-  background-image: url(../images/168ec4/orgchart.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-themes-page.is-active:before {
-  background-image: url(../images/168ec4/paintbrush.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-entity-user-collection.is-active:before {
-  background-image: url(../images/168ec4/people.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-modules-list.is-active:before {
-  background-image: url(../images/168ec4/puzzlepiece.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-config.is-active:before {
-  background-image: url(../images/168ec4/wrench.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-system-admin-reports.is-active:before {
-  background-image: url(../images/168ec4/barchart.svg);
-}
-
-.acquia-cms-toolbar .menu-item--expanded:hover .toolbar-icon-help-main:before {
-  background-image: url(../images/168ec4/questionmark-disc.svg);
-}
-
-.acquia-cms-toolbar .toolbar-icon-help-main.is-active:before {
-  background-image: url(../images/168ec4/questionmark-disc.svg);
-}
-
-#toolbar-item-administration-search-tray label {
-  background: transparent;
-  color: #545560 !important;
-}
-
-[dir="rtl"] .acquia-cms-toolbar .toolbar .toolbar-tray-horizontal .menu-item + .menu-item {
-  border-right: none;
-  border-left: none;
-}
-
-[dir="rtl"] .acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded {
-  position: relative;
-  background-image: none;
-}
-
-[dir="rtl"] .acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded:after {
-  top: 30%;
-  right: auto;
-  left: 5px;
-  transform: scaleX(-1);
-  -webkit-filter: FlipH;
-  filter: FlipH;
-  -moz-transform: scaleX(-1);
-  -o-transform: scaleX(-1);
-  -webkit-transform: scaleX(-1);
-  -ms-filter: "FlipH";
-}
-
-[dir="rtl"] .acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded:hover:after {
-  transform: scaleX(-1);
-  -webkit-transform-origin: 40% top;
-  transform-origin: 40% top;
-  -webkit-filter: FlipH;
-  filter: FlipH;
-  -moz-transform: scaleX(-1);
-  -o-transform: scaleX(-1);
-  -webkit-transform: scaleX(-1);
-  -ms-filter: "FlipH";
-}
-
-[dir="rtl"] .acquia-cms-toolbar .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item:hover ul {
-  margin: -39px 200px 0 0;
-}
-
-.toolbar .toolbar-tray-vertical .level-2 a {
-  color: #cccccc !important;
-}
-
-.toolbar .toolbar-tray-vertical .level-3 ul {
-  margin-left: 0 !important;
-}
-
-.acquia-cms-toolbar.acquia-cms-environment-local .toolbar .toolbar-bar:before,
-.acquia-cms-toolbar.acquia-cms-environment-ide .toolbar .toolbar-bar:before {
-  background-color: #1078c2;
-}
-
-.acquia-cms-toolbar.acquia-cms-environment-dev .toolbar .toolbar-bar:before {
-  background-color: #498414;
-}
-
-.acquia-cms-toolbar.acquia-cms-environment-stage .toolbar .toolbar-bar:before {
-  background-color: #feb32b;
-}
-
-.acquia-cms-toolbar.acquia-cms-environment-prod .toolbar .toolbar-bar:before {
-  background-color: #cd3a3d;
+.acquia-cms-toolbar .toolbar-icon-environment.environment-local:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-local,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-ide:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-ide,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-dev:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-dev,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-stage:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-stage,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-prod:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-prod {
+  color: #fff !important;
+  margin-right: 5px !important;
+}
+
+.acquia-cms-toolbar.acquia-cms-environment-local #toolbar-administration .toolbar-bar:before,
+.acquia-cms-toolbar.acquia-cms-environment-ide #toolbar-administration .toolbar-bar:before,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-local:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-local,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-ide:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-ide {
+  background-color: #1078c2 !important;
+  border-radius: 0px !important;
+}
+
+.acquia-cms-toolbar.acquia-cms-environment-dev #toolbar-administration .toolbar-bar:before,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-dev:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-dev {
+  background-color: #498414 !important;
+  border-radius: 0px !important;
+}
+
+.acquia-cms-toolbar.acquia-cms-environment-stage #toolbar-administration .toolbar-bar:before,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-stage:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-stage {
+  background-color: #feb32b !important;
+  border-radius: 0px !important;
+}
+
+.acquia-cms-toolbar.acquia-cms-environment-prod #toolbar-administration .toolbar-bar:before,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-prod:hover,
+.acquia-cms-toolbar .toolbar-icon-environment.environment-prod {
+  background-color: #cd3a3d !important;
+  border-radius: 0px !important;
 }
 
 .toolbar-tray-horizontal .toolbar-menu:not(:first-child) li.menu-item--expanded > a:focus {