diff --git a/static/css/core-ui.css b/static/css/core-ui.css
index 4c401c8a2..c3f152c98 100644
--- a/static/css/core-ui.css
+++ b/static/css/core-ui.css
@@ -1206,9 +1206,9 @@ a:focus {
 
 .co-alert.co-alert-danger:before {
   font-family: core-icons;
-  content: "\f108";
+  content: "\f109";
   position: absolute;
-  top: 11px;
+  top: 19px;
   left: 12px;
   font-size: 22px;
   color: red;
diff --git a/static/directives/config/config-setup-tool.html b/static/directives/config/config-setup-tool.html
index 2f247a2ee..35511916f 100644
--- a/static/directives/config/config-setup-tool.html
+++ b/static/directives/config/config-setup-tool.html
@@ -635,7 +635,7 @@
     <!-- GitLab Trigger -->
     <div class="co-panel" ng-if="config.FEATURE_BUILD_SUPPORT" style="margin-top: 20px;">
       <div class="co-panel-heading">
-        <i class="fa fa-git-square"></i> GitLab Build Triggers
+        <i class="fa ci-gitlab"></i> GitLab Build Triggers
       </div>
       <div class="co-panel-body">
         <div class="description">
diff --git a/static/js/services/features-config.js b/static/js/services/features-config.js
index 7cc66b2dc..ec7800714 100644
--- a/static/js/services/features-config.js
+++ b/static/js/services/features-config.js
@@ -72,8 +72,8 @@ angular.module('quay').factory('Config', [function() {
   };
 
   config.isNewLayout = function() {
-    // TODO(jschorr): Remove once new layout is in place for everyone.
-    return document.cookie.toString().indexOf('quay.exp-new-layout=true') >= 0;
+    // TODO(jschorr): Remove in the cleanup CL.
+    return true;
   };
 
   return config;
diff --git a/static/js/services/trigger-service.js b/static/js/services/trigger-service.js
index 8b636d701..3c5be1ecd 100644
--- a/static/js/services/trigger-service.js
+++ b/static/js/services/trigger-service.js
@@ -19,8 +19,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
         var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' +
           namespace + '/' + repository;
 
-        // TODO(jschorr): Remove once the new layout is in place.
-        if (CookieService.get('quay.exp-new-layout') == 'true') {
+        if (Config.isNewLayout()) {
           redirect_uri += '/__new';
         }
 
@@ -103,7 +102,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
       'is_enabled': function() {
         return Features.GITLAB_BUILD;
       },
-      'icon': 'fa-git-square',
+      'icon': 'ci-gitlab',
       'title': function() { return 'GitLab Repository Push'; },
       'supports_full_directory_listing': false,
       'templates': {
@@ -132,7 +131,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
       },
       'is_external': false,
       'is_enabled': function() { return true; },
-      'icon': 'fa-git',
+      'icon': 'fa-git-square',
       'title': function() { return 'Custom Git Repository Push'; },
       'templates': {
         'credentials': '/static/directives/trigger/custom-git/credentials.html',