diff --git a/ui/app/components/console/ui-panel.js b/ui/app/components/console/ui-panel.js
index 11487462bd..ee011ac1c4 100644
--- a/ui/app/components/console/ui-panel.js
+++ b/ui/app/components/console/ui-panel.js
@@ -20,7 +20,7 @@ export default Component.extend({
   controlGroup: service(),
   store: service(),
 
-  classNames: 'console-ui-panel-scroller',
+  classNames: 'console-ui-panel',
   classNameBindings: ['isFullscreen:fullscreen'],
   isFullscreen: false,
   inputValue: null,
@@ -114,6 +114,9 @@ export default Component.extend({
   },
 
   actions: {
+    closeConsole() {
+      this.set('console.isOpen', false);
+    },
     toggleFullscreen() {
       this.toggleProperty('isFullscreen');
     },
diff --git a/ui/app/components/i-con.js b/ui/app/components/i-con.js
index 78d182f10b..639094d80e 100644
--- a/ui/app/components/i-con.js
+++ b/ui/app/components/i-con.js
@@ -25,6 +25,12 @@ const GLYPHS_WITH_SVG_TAG = [
   'check-plain',
   'check-circle-fill',
   'cancel-square-outline',
+  'status-indicator',
+  'person',
+  'console',
+  'checkmark-circled-outline',
+  'close-circled-outline',
+  'neutral-circled-outline',
 ];
 
 export default Component.extend({
diff --git a/ui/app/components/nav-header.js b/ui/app/components/nav-header.js
index 15a4ae2f5e..79378b3f34 100644
--- a/ui/app/components/nav-header.js
+++ b/ui/app/components/nav-header.js
@@ -3,4 +3,13 @@ import Component from '@ember/component';
 export default Component.extend({
   'data-test-navheader': true,
   tagName: 'header',
+  navDrawerOpen: false,
+  actions: {
+    toggleNavDrawer(isOpen) {
+      if (isOpen !== undefined) {
+        return this.set('navDrawerOpen', isOpen);
+      }
+      this.toggleProperty('navDrawerOpen');
+    },
+  },
 });
diff --git a/ui/app/components/status-menu.js b/ui/app/components/status-menu.js
index 492a302d8d..9b1e23548b 100644
--- a/ui/app/components/status-menu.js
+++ b/ui/app/components/status-menu.js
@@ -7,19 +7,24 @@ export default Component.extend({
   currentCluster: service('current-cluster'),
   cluster: alias('currentCluster.cluster'),
   auth: service(),
+  store: service(),
+  media: service(),
   type: 'cluster',
   itemTag: null,
   partialName: computed('type', function() {
-    let type = this.get('type');
-    let partial = type === 'replication-status' ? 'replication' : type;
-    return `partials/status/${partial}`;
+    return `partials/status/${this.type}`;
   }),
   glyphName: computed('type', function() {
     const glyphs = {
-      cluster: 'unlocked',
-      user: 'android-person',
-      'replication-status': 'replication',
+      cluster: 'status-indicator',
+      user: 'person',
     };
-    return glyphs[this.get('type')];
+    return glyphs[this.type];
+  }),
+  activeCluster: computed('auth.activeCluster', function() {
+    return this.get('store').peekRecord('cluster', this.get('auth.activeCluster'));
+  }),
+  currentToken: computed('auth.currentToken', function() {
+    return this.get('auth.currentToken');
   }),
 });
diff --git a/ui/app/controllers/vault/cluster/settings/control-groups.js b/ui/app/controllers/vault/cluster/access/control-groups-configure.js
similarity index 100%
rename from ui/app/controllers/vault/cluster/settings/control-groups.js
rename to ui/app/controllers/vault/cluster/access/control-groups-configure.js
diff --git a/ui/app/router.js b/ui/app/router.js
index 1301330180..5952710f40 100644
--- a/ui/app/router.js
+++ b/ui/app/router.js
@@ -29,7 +29,6 @@ Router.map(function() {
           this.route('index', { path: '/' });
           this.route('section', { path: '/:section_name' });
         });
-        this.route('control-groups');
       });
       this.route('unseal');
       this.route('tools', function() {
@@ -66,6 +65,7 @@ Router.map(function() {
           });
         });
         this.route('control-groups');
+        this.route('control-groups-configure', { path: '/control-groups/configure' });
         this.route('control-group-accessor', { path: '/control-groups/:accessor' });
         this.route('namespaces', function() {
           this.route('index', { path: '/' });
diff --git a/ui/app/routes/vault/cluster/settings/control-groups.js b/ui/app/routes/vault/cluster/access/control-groups-configure.js
similarity index 100%
rename from ui/app/routes/vault/cluster/settings/control-groups.js
rename to ui/app/routes/vault/cluster/access/control-groups-configure.js
diff --git a/ui/app/routes/vault/cluster/settings/index.js b/ui/app/routes/vault/cluster/settings/index.js
index 286bcbf2a9..cd1f30425e 100644
--- a/ui/app/routes/vault/cluster/settings/index.js
+++ b/ui/app/routes/vault/cluster/settings/index.js
@@ -4,7 +4,7 @@ export default Route.extend({
   beforeModel: function(transition) {
     if (transition.targetName === this.routeName) {
       transition.abort();
-      this.replaceWith('vault.cluster.settings.mount-secret-backend');
+      return this.replaceWith('vault.cluster.settings.mount-secret-backend');
     }
   },
 });
diff --git a/ui/app/styles/components/console-ui-panel.scss b/ui/app/styles/components/console-ui-panel.scss
index 19b0085c59..de3a10fcea 100644
--- a/ui/app/styles/components/console-ui-panel.scss
+++ b/ui/app/styles/components/console-ui-panel.scss
@@ -1,27 +1,43 @@
-.console-ui-panel-scroller {
+.console-ui-panel {
   background: linear-gradient(to right, #191a1c, #1b212d);
   height: 0;
   left: 0;
-  overflow: auto;
-  position: absolute;
+  position: fixed;
   min-height: 0;
+  overflow: scroll;
   right: 0;
-  transform: translate3d(0, -400px, 0);
+  top: $header-height;
+  transform: translate3d(0, -100%, -1);
   transition: min-height $speed ease-out, transform $speed ease-in;
   will-change: transform, min-height;
   -webkit-overflow-scrolling: touch;
+  width: 100vw;
   z-index: 199;
+
+  .button {
+    background: transparent;
+    border: none;
+    color: $grey;
+    min-width: 0;
+    padding: 0 $size-8;
+
+    &.active,
+    &:hover {
+      background: $blue;
+      color: $white;
+    }
+  }
 }
 
-.console-ui-panel {
+.console-ui-panel-content {
+  color: $white;
   display: flex;
   flex-direction: column;
-  justify-content: flex-end;
-  padding: $size-8 $size-8 $size-4;
-  min-height: 100%;
-  color: $white;
   font-size: $body-size;
   font-weight: $font-weight-semibold;
+  justify-content: flex-end;
+  min-height: 100%;
+  padding: $size-8 $size-8 $size-4;
   transition: justify-content $speed ease-in;
 
   pre,
@@ -43,24 +59,10 @@
     margin-left: $console-spacing;
     padding: $size-8 $size-4;
   }
-
-  .button {
-    background: transparent;
-    border: none;
-    color: $grey-dark;
-    min-width: 0;
-    padding: 0 $size-8;
-
-    &.active,
-    &:hover {
-      background: $blue;
-      color: $white;
-    }
-  }
 }
 
-.console-ui-panel .hover-copy-button,
-.console-ui-panel .hover-copy-button-static {
+.console-ui-panel-content.hover-copy-button,
+.console-ui-panel-content.hover-copy-button-static {
   top: auto;
   bottom: 0;
   right: 0;
@@ -75,7 +77,7 @@
     border: 0;
     caret-color: $white;
     color: $white;
-    flex: 1;
+    flex: 1 1 auto;
     font-family: $family-monospace;
     font-size: 16px;
     font-weight: $font-weight-bold;
@@ -112,19 +114,29 @@
   }
 }
 
-.panel-open .console-ui-panel-scroller {
+.panel-open .console-ui-panel {
   box-shadow: $box-shadow-highest;
-  transform: translate3d(0, 0, 0);
+  transform: translate3d($drawer-width, 0, 0);
   min-height: 400px;
+
+  @include from($mobile) {
+    transform: translate3d(0, 0, 0);
+  }
 }
 
-.panel-open .console-ui-panel-scroller.fullscreen {
+.panel-open .console-ui-panel.fullscreen {
   bottom: 0;
-  top: 0;
-  position: fixed;
   min-height: 100%;
 }
 
+.navbar-drawer .console-ui-panel {
+  transform: translate3d($drawer-width, 0, 0);
+
+  @include from($mobile) {
+    transform: translate3d(0, 0, 0);
+  }
+}
+
 .panel-open {
   .navbar,
   .navbar-sections {
@@ -135,14 +147,12 @@
 .panel-open.panel-fullscreen {
   .navbar,
   .navbar-sections {
-    transform: translate3d(0, -100px, 0);
+    @include from($mobile) {
+      transform: translate3d(0, -100px, 0);
+    }
   }
 }
 
-.page-container > header:not(.page-header) {
-  background: linear-gradient(to right, #191a1c, #1b212d);
-}
-
 header .navbar,
 header .navbar-sections {
   z-index: 200;
@@ -164,3 +174,14 @@ header .navbar-sections {
     bottom: 0.25rem;
   }
 }
+
+.console-close-button {
+  position: absolute;
+  top: -3.25rem;
+  right: $spacing-xs;
+  z-index: 210;
+
+  @include from($mobile) {
+    display: none;
+  }
+}
diff --git a/ui/app/styles/components/list-item-row.scss b/ui/app/styles/components/list-item-row.scss
index 3a170c345a..c03a44e2ed 100644
--- a/ui/app/styles/components/list-item-row.scss
+++ b/ui/app/styles/components/list-item-row.scss
@@ -4,6 +4,10 @@
   @extend .is-marginless;
   padding-left: 0;
   padding-right: 0;
+
+  .ember-basic-dropdown-trigger {
+    display: inline-block;
+  }
 }
 
 a.list-item-row,
diff --git a/ui/app/styles/components/namespace-picker.scss b/ui/app/styles/components/namespace-picker.scss
index 8e9ad3b47a..8e6b72308d 100644
--- a/ui/app/styles/components/namespace-picker.scss
+++ b/ui/app/styles/components/namespace-picker.scss
@@ -1,30 +1,72 @@
 .namespace-picker {
-  border-right: 1px solid rgba($black, 0.5);
-  margin-right: $size-10;
   position: relative;
-  padding: 0.5rem;
   color: $white;
+  display: flex;
   fill: $white;
+  padding: $spacing-xxs $spacing-xs;
+  width: 100%;
+
+  @include from($mobile) {
+    margin-left: -$spacing-xs;
+    padding: $spacing-xxs 0 $spacing-xxs $spacing-s;
+    width: auto;
+  }
 }
+
 .namespace-picker.no-namespaces {
   border: none;
   padding-right: 0;
 }
 .namespace-picker-trigger {
-  display: flex;
   align-items: center;
+  display: flex;
+  flex: 1 1 auto;
+  height: 2rem;
+  justify-content: space-between;
+  padding: 0;
+  text-align: left;
+
+  @include from($mobile) {
+    height: auto;
+    padding: $spacing-xs $spacing-m;
+  }
+
+  .is-status-chevron {
+    transform: rotate(-90deg);
+
+    @include from($mobile) {
+      transform: rotate(0deg);
+    }
+  }
+
+  &.ember-basic-dropdown-trigger--below .is-status-chevron {
+    transform: rotate(0deg);
+
+    @include from($mobile) {
+      transform: rotate(180deg);
+    }
+  }
 }
 .namespace-name {
   display: inline-block;
-  margin-left: $size-10;
+  flex: 1 1 auto;
   font-size: 1rem;
+  margin: 0 $spacing-xs;
+
+  @include from($mobile) {
+    margin-left: $size-10;
+  }
 }
 .namespace-picker-content {
-  width: 300px;
+  width: $drawer-width - ($spacing-xs * 2);
   max-height: 300px;
   overflow: auto;
   border-radius: $radius;
   box-shadow: $box-shadow, $box-shadow-high;
+
+  @include from($mobile) {
+    width: $drawer-width;
+  }
 }
 .namespace-picker-content .level-left {
   max-width: 210px;
@@ -74,7 +116,7 @@
   z-index: 1;
 }
 .leaf-panel-left {
-  transform: translateX(-300px);
+  transform: translateX(-$drawer-width);
 }
 .leaf-panel-adding,
 .leaf-panel-current {
@@ -86,7 +128,7 @@
 .animated-list {
   .leaf-panel-exiting,
   .leaf-panel-adding {
-    transform: translateX(300px);
+    transform: translateX($drawer-width);
     z-index: 20;
   }
 }
diff --git a/ui/app/styles/components/namespace-reminder.scss b/ui/app/styles/components/namespace-reminder.scss
index 60c041ea61..d5503069e7 100644
--- a/ui/app/styles/components/namespace-reminder.scss
+++ b/ui/app/styles/components/namespace-reminder.scss
@@ -4,9 +4,16 @@
 }
 
 .console-reminder p.namespace-reminder {
-  margin-bottom: 0;
-  opacity: 0.7;
-  position: absolute;
   color: $grey;
   font-family: $family-monospace;
+  font-size: $size-8;
+  margin: $spacing-xxs 0 0;
+  opacity: 0.7;
+  position: absolute;
+
+  .tag {
+    background-color: $ui-gray-800;
+    color: $light-grey;
+    font-size: $size-9;
+  }
 }
diff --git a/ui/app/styles/components/page-header.scss b/ui/app/styles/components/page-header.scss
index 13d7977a36..dd985b3f45 100644
--- a/ui/app/styles/components/page-header.scss
+++ b/ui/app/styles/components/page-header.scss
@@ -9,9 +9,15 @@
   .level-right {
     flex-grow: 1;
     flex-shrink: 1;
+
+    @include until($tablet) {
+      margin-top: 0.5rem;
+    }
   }
   .level-right {
-    justify-content: flex-end;
+    @include from($tablet) {
+      justify-content: flex-end;
+    }
   }
 
   .title {
@@ -23,6 +29,7 @@
   }
   .title .icon {
     height: auto;
+    vertical-align: -0.15em;
     width: auto;
   }
 }
diff --git a/ui/app/styles/components/popup-menu.scss b/ui/app/styles/components/popup-menu.scss
index 928b94b148..b67366b297 100644
--- a/ui/app/styles/components/popup-menu.scss
+++ b/ui/app/styles/components/popup-menu.scss
@@ -7,11 +7,11 @@
     box-shadow: $box-shadow, $box-shadow-middle;
     padding: 0;
     position: relative;
-    width: 175px;
+    width: 200px;
   }
 
   &.is-wide > .box {
-    width: 300px;
+    width: $drawer-width;
   }
 
   .confirm-action span .button {
@@ -24,7 +24,8 @@
     padding: $size-11 0;
 
     button.link,
-    a {
+    a,
+    .menu-item {
       background: transparent;
       box-shadow: none;
       border: none;
@@ -59,17 +60,30 @@
           color: $white;
         }
       }
+
+      &.disabled {
+        opacity: 0.5;
+        
+        &:hover {
+          background: transparent;
+          cursor: default;
+        }
+      }
+    }
+
+    small code {
+      margin-left: $spacing-xs;
     }
   }
 
   .menu-label {
     color: $grey-dark;
-    font-size: $size-8;
-    font-weight: $font-weight-semibold;
+    font-size: $size-9;
+    font-weight: $font-weight-normal;
     letter-spacing: 0;
     margin: 0;
-    padding: $size-10 $size-8 $size-11;
-    text-transform: none;
+    padding: $size-10 $size-8 0;
+    text-transform: uppercase;
   }
 
   .menu-content {
@@ -77,8 +91,8 @@
   }
 
   hr {
-    background-color: $grey-light;
-    margin: $size-11 0;
+    background-color: $ui-gray-200;
+    margin: 0;
   }
 }
 
@@ -99,6 +113,12 @@
 
 .status-menu-content {
   margin-top: 8px;
+
+  .box {
+    @include until($mobile) {
+      width: $drawer-width - ($spacing-xs * 2);
+    }
+  }
 }
 
 .ember-basic-dropdown-content {
diff --git a/ui/app/styles/components/sidebar.scss b/ui/app/styles/components/sidebar.scss
index 585d3abc3e..7eade62930 100644
--- a/ui/app/styles/components/sidebar.scss
+++ b/ui/app/styles/components/sidebar.scss
@@ -1,7 +1,7 @@
 .is-sidebar {
   border-right: $base-border;
   display: flex;
-  flex: 1;
+  flex: 1 1 auto;
   margin: 0.75rem 0.75rem 0.75rem 0;
   padding: 0 0 0 0.75rem;
 
@@ -10,13 +10,13 @@
     bottom: 0;
     left: -1.5rem;
     margin: 0;
-    max-width: 300px;
-    padding-left: 0;
+    max-width: $drawer-width;
+    padding: $spacing-m 0 0;
     position: absolute;
     right: $size-2;
     transform: translateX(-100%);
     transition: transform $speed;
-    top: -3rem;
+    top: 0;
     z-index: 5;
   }
 
@@ -24,19 +24,24 @@
     @include until($tablet) {
       transform: translateX(0);
     }
+
+    .menu-toggle {
+      left: auto;
+      right: $size-10;
+    }
   }
 
   .menu-toggle {
     color: $blue;
     cursor: pointer;
     display: none;
+    margin-left: $size-10;
+    left: 100%;
+    position: absolute;
+    top: 0;
 
     @include until($tablet) {
       display: block;
-      margin-left: $size-8;
-      position: absolute;
-      top: 4.2rem;
-      left: 100%;
     }
 
     .button {
@@ -45,7 +50,7 @@
   }
 
   .menu {
-    flex: 1;
+    flex: 1 1 auto;
     padding-top: 5.25rem;
     position: relative;
 
@@ -56,7 +61,7 @@
 
   .menu-label {
     color: $grey-light;
-    font-weight: $font-weight-semibold;
+    font-weight: $font-weight-bold;
     font-size: $size-small;
     line-height: 1;
     margin-bottom: $size-8;
@@ -67,6 +72,10 @@
     border-top: $base-border;
     padding: $size-9 0;
 
+    @include until($tablet) {
+      padding-top: $size-4;
+    }
+
     a {
       color: $grey-dark;
       padding-left: $size-5;
diff --git a/ui/app/styles/components/splash-page.scss b/ui/app/styles/components/splash-page.scss
index 3f1415c554..4338ca80f3 100644
--- a/ui/app/styles/components/splash-page.scss
+++ b/ui/app/styles/components/splash-page.scss
@@ -1,13 +1,19 @@
-a.splash-page-logo {
-  color: $white;
-  svg {
-    transform: scale(.5);
-    transform-origin: left;
-    fill: $white;
+.navbar-brand .splash-page-logo {
+  padding: $spacing-xs $spacing-s $spacing-xs $spacing-l;
+
+  @include from($mobile) {
+    padding-left: $spacing-xs;
+  }
+
+  svg {
+    fill: $white;
+    height: 24px;
+    width: 72px;
+
+    @include from($mobile) {
+      margin-left: $spacing-xs;
+    }
   }
-}
-a.splash-page-logo.is-active {
-  background: transparent;
 }
 
 .splash-page-container {
diff --git a/ui/app/styles/components/status-menu.scss b/ui/app/styles/components/status-menu.scss
index 00d27c7b44..e6118437c5 100644
--- a/ui/app/styles/components/status-menu.scss
+++ b/ui/app/styles/components/status-menu.scss
@@ -1,16 +1,31 @@
-.is-status-chevron {
-  line-height: 0;
-  padding: 0.3em 0 0 $size-11;
-}
+.status-indicator-button {
+  &[data-status="good"] {
+    .status-indicator-icon-dot {
+      fill: $green-light;
+    }
 
-.status-menu-user-trigger {
-  height: 1.5em;
-  width: 1.5em;
-  background: $white-bis;
-  box-shadow: 0 0 0 1px $white;
-  margin-right: 0.25rem;
+    .status-indicator-icon-ring {
+      fill: $green-dark;
+    }
+  }
 
-  .icon {
-    min-width: 0;
+  &[data-status="mixed"] {
+    .status-indicator-icon-dot {
+      fill: $yellow;
+    }
+
+    .status-indicator-icon-ring {
+      fill: $yellow-dark;
+    }
+  }
+
+  &[data-status="bad"] {
+    .status-indicator-icon-dot {
+      fill: $red;
+    }
+
+    .status-indicator-icon-ring {
+      fill: $red-dark;
+    }
   }
 }
diff --git a/ui/app/styles/components/sub-nav.scss b/ui/app/styles/components/sub-nav.scss
deleted file mode 100644
index 3be16a876a..0000000000
--- a/ui/app/styles/components/sub-nav.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-.sub-nav {
-  &.tabs {
-    box-shadow: inset 0 -1px 0 $grey-light;
-
-    ul {
-      border-color: transparent;
-    }
-
-    li {
-      &:focus {
-        box-shadow: none;
-      }
-      &.is-active a {
-        border-color: $blue;
-        color: $blue;
-      }
-      &:first-child a {
-        margin-left: $size-5;
-      }
-    }
-
-    a {
-      color: $grey-dark;
-      font-weight: $font-weight-semibold;
-      text-decoration: none;
-      padding: $size-6 $size-8 $size-8;
-      border-bottom: 2px solid transparent;
-      transition: border-color $speed;
-
-      &:hover,
-      &:active {
-        border-color: $grey-light;
-      }
-    }
-
-    .ember-basic-dropdown-trigger {
-      outline: none;
-    }
-  }
-}
diff --git a/ui/app/styles/components/tabs.scss b/ui/app/styles/components/tabs.scss
new file mode 100644
index 0000000000..ef0c844b7c
--- /dev/null
+++ b/ui/app/styles/components/tabs.scss
@@ -0,0 +1,38 @@
+.tabs {
+  box-shadow: inset 0 -1px 0 $grey-light;
+
+  ul {
+    border-color: transparent;
+  }
+
+  li {
+    &:focus {
+      box-shadow: none;
+    }
+    &.is-active a {
+      border-color: $blue;
+      color: $blue;
+    }
+    &:first-child a {
+      margin-left: $size-5;
+    }
+  }
+
+  a {
+    color: $grey-dark;
+    font-weight: $font-weight-semibold;
+    text-decoration: none;
+    padding: $size-6 $size-8 $size-8;
+    border-bottom: 2px solid transparent;
+    transition: border-color $speed;
+
+    &:hover,
+    &:active {
+      border-color: $grey-light;
+    }
+  }
+
+  .ember-basic-dropdown-trigger {
+    outline: none;
+  }
+}
diff --git a/ui/app/styles/components/tool-tip.scss b/ui/app/styles/components/tool-tip.scss
index 6cc720f897..13591c3970 100644
--- a/ui/app/styles/components/tool-tip.scss
+++ b/ui/app/styles/components/tool-tip.scss
@@ -26,7 +26,13 @@
 }
 
 .ember-basic-dropdown-content--left.tool-tip {
-  margin: 8px 0 0 -11px;
+  margin: 8px 0 0 -2px;
+
+  &::before,
+  &::after {
+    right: auto;
+    left: $spacing-s;
+  }
 }
 .ember-basic-dropdown-content--right.tool-tip {
   margin: 8px -11px;
diff --git a/ui/app/styles/components/ui-wizard.scss b/ui/app/styles/components/ui-wizard.scss
index 8648f8bd78..52cb4dc2a0 100644
--- a/ui/app/styles/components/ui-wizard.scss
+++ b/ui/app/styles/components/ui-wizard.scss
@@ -24,13 +24,13 @@
 .ui-wizard {
   z-index: 300;
   padding: $size-5;
-  width: 300px;
+  width: $drawer-width;
   background: $white;
   box-shadow: $box-shadow, $box-shadow-highest;
   position: fixed;
   right: $size-8;
   bottom: $size-8;
-  top: calc(3.5rem + #{$size-8});
+  top: calc(#{$header-height} + #{$size-8});
   overflow: auto;
 
   p {
@@ -101,7 +101,7 @@
   padding-bottom: $size-11;
   position: fixed;
   right: $size-8;
-  top: calc(3.5rem + #{$size-8});
+  top: calc(#{$header-height} + #{$size-8});
 
   @include until($tablet) {
     box-shadow: $box-shadow, 0 0 20px rgba($black, 0.24);
@@ -121,6 +121,7 @@
   }
 
   .wizard-header {
+    border-bottom: 0;
     margin: 0 0 $size-10;
     padding-top: 0;
   }
@@ -142,7 +143,7 @@
   margin: $size-8 0 0;
   padding: 0 $size-8;
   border-top: solid 1px $white;
-  border-image: $dark-vault-gradient 1;
+  border-image: linear-gradient(to right, $vault-gray-dark, $vault-gray) 1;
   border-width: 1px 0 0;
   button {
     font-size: $size-7;
diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss
index 4fcbff2295..73b633193c 100644
--- a/ui/app/styles/core.scss
+++ b/ui/app/styles/core.scss
@@ -1,5 +1,6 @@
 // Start with Structure & Bulma variables as a foundation
 @import "./utils/colors";
+@import "./utils/spacing";
 @import "bulma/sass/utilities/initial-variables";
 
 // Override variables where appropriate
@@ -32,12 +33,10 @@
 @import "./core/progress";
 @import "./core/switch";
 @import "./core/tables";
-@import "./core/tabs";
 @import "./core/tags";
 @import "./core/title";
 
 // bulma additions
-@import "./core/gradients";
 @import "./core/layout";
 @import "./core/lists";
 
@@ -76,7 +75,7 @@
 @import "./components/sidebar";
 @import "./components/splash-page";
 @import "./components/status-menu";
-@import "./components/sub-nav";
+@import "./components/tabs";
 @import "./components/token-expire-warning";
 @import "./components/tool-tip";
 @import "./components/unseal-warning";
diff --git a/ui/app/styles/core/forms.scss b/ui/app/styles/core/forms.scss
index 3513b744c9..864d32d0e1 100644
--- a/ui/app/styles/core/forms.scss
+++ b/ui/app/styles/core/forms.scss
@@ -193,6 +193,7 @@ label {
 
 .select:not(.is-multiple)::before {
   @extend .select:not(.is-multiple)::after;
+  content: "";
   transform: translateY(-70%) rotate(135deg);
   z-index: 5;
 }
diff --git a/ui/app/styles/core/gradients.scss b/ui/app/styles/core/gradients.scss
deleted file mode 100644
index dd137335ee..0000000000
--- a/ui/app/styles/core/gradients.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-$dark-vault-gradient: linear-gradient(to right, $vault-gray-dark, $vault-gray);
-.has-dark-vault-gradient {
-  background: $dark-vault-gradient;
-}
diff --git a/ui/app/styles/core/layout.scss b/ui/app/styles/core/layout.scss
index 49b0993277..2a12adb2c6 100644
--- a/ui/app/styles/core/layout.scss
+++ b/ui/app/styles/core/layout.scss
@@ -3,9 +3,10 @@
   flex-direction: column;
 }
 .page-container {
-  min-height: 100vh;
+  min-height: calc(100vh - #{$header-height});
   display: flex;
   flex-direction: column;
+  margin-top: $header-height;
   justify-content: flex-end;
 }
 
diff --git a/ui/app/styles/core/navbar.scss b/ui/app/styles/core/navbar.scss
index eb09d3ee41..720e61697f 100644
--- a/ui/app/styles/core/navbar.scss
+++ b/ui/app/styles/core/navbar.scss
@@ -1,65 +1,248 @@
 .navbar {
-  align-items: center;
-  height: 3.5rem;
-}
-
-.navbar-end {
-  .navbar-item {
-    padding: 0.5em 0.75em;
-
-    .button {
-      display: inline-flex;
-      min-width: 2.5rem;
-    }
-  }
-}
-
-a.navbar-item {
-  color: $white-ter;
-  &:hover,
-  &:active {
-    color: $white;
-    background: transparent;
-  }
+  background-color: $black;
+  display: flex;
+  height: $header-height;
+  justify-content: flex-start;
+  left: 0;
+  padding: $spacing-xs $spacing-s $spacing-xs 0;
+  position: fixed;
+  right: 0;
+  top: 0;
 }
 
 .navbar-brand {
-  margin: 0 0 0 $size-10;
+  background: $vault-gray;
+  border-radius: 0 $radius-large $radius-large 0;
+  margin-right: $spacing-s;
+  min-height: auto;
+  position: relative;
+  z-index: 203;
 
-  a {
-    @include from($tablet) {
-      height: 3.25rem;
+  .navbar-item {
+    background-color: transparent;
+    padding: $spacing-xs $spacing-l;
+
+    &:hover,
+    .is-active {
+      background-color: transparent;
     }
   }
 }
 
+.navbar-drawer-toggle {
+  color: $vault-gray;
+  cursor: pointer;
+  font-weight: $font-weight-semibold;
+  margin-left: -$spacing-s;
+  padding: $spacing-xs $spacing-xxs;
+  background: none;
+  border: none;
+
+  .navbar-drawer & {
+    position: absolute;
+    top: $spacing-xs;
+    right: $spacing-xxs;
+  }
+}
+
+.navbar-drawer-overlay {
+  height: 100vh;
+  left: 0;
+  pointer-events: none;
+  position: fixed;
+  right: 0;
+  top: 0;
+  transition: background-color $speed, opacity $speed;
+  will-change: background-color, opacity;
+  z-index: -1;
+
+  &.is-active {
+    background-color: rgba($black, 0.25);
+    pointer-events: all;
+
+    @include from($mobile) {
+      background-color: transparent;
+      pointer-events: none;
+    }
+  }
+}
+
+.navbar-sections,
+.navbar-sections li,
+.navbar-drawer-scroll,
+.navbar-drawer-scroll > * {
+  @include from($mobile) {
+    align-items: center;
+    display: flex;
+  }
+}
+
 .navbar-sections {
-  justify-content: flex-start;
-  background-color: $grey;
+  a {
+    color: $grey-light;
+    display: block;
+    font-weight: $font-weight-semibold;
+    line-height: 1.3;
+    padding: $spacing-xs $spacing-m;
+    text-decoration: none;
+    transition: background-color $speed, color $speed;
+    will-change: background-color, color;
 
-  @include from($tablet) {
-    background-color: transparent;
-    position: absolute;
-    left: 3.5em;
-    top: 0;
-    height: 3.25rem;
-    &.with-ns-picker {
-      left: 0;
+    @include from($mobile) {
+      border-radius: $radius;
+      display: inline-block;
+      padding: $spacing-xxs $spacing-s;
     }
-  }
 
-  .icon.edition-icon {
-    margin: -0.25em -0.5em -0.25em 0.15em;
-    opacity: 0.33;
-    transition: opacity $speed;
-
-    #edition-enterprise-hexagon {
-      fill: #fff;
+    &.is-active {
+      background-color: $vault-gray-700;
+      color: $white;
     }
-  }
 
-  li.is-active .icon.edition-icon,
-  li:hover .icon.edition-icon {
-    opacity: 0.5;
+    &:hover {
+      color: $white;
+    }
+  }
+}
+
+.navbar-end {
+  margin-left: auto;
+}
+
+.navbar-item {
+  padding: $spacing-xs;
+}
+
+.navbar-separator {
+  background-color: $ui-gray-700;
+  height: 1px;
+  margin: $spacing-xs 0;
+  width: 100%;
+
+  @include from($mobile) {
+    height: $spacing-l;
+    margin: 0 $spacing-s;
+    width: 1px;
+  }
+}
+
+.navbar-drawer {
+  flex: 1 1 auto;
+
+  @include until($mobile) {
+    background-color: $ui-gray-900;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    left: 0;
+    padding: 4rem 0 $spacing-m;
+    position: fixed;
+    top: 0;
+    transform: translateX(-100%);
+    transition: box-shadow $speed, transform $speed-slow;
+    width: $drawer-width;
+    will-change: transform, box-shadow;
+    z-index: 201;
+  }
+
+  &.is-active {
+    @include until($mobile) {
+      box-shadow: 5px 0 10px rgba($black, 0.36);
+      transform: translateX(0);
+    }
+  }
+
+  .navbar-item .button {
+    color: $grey-light;
+    display: flex;
+    font-size: 1rem;
+    height: auto;
+    justify-content: flex-start;
+    padding: 0 $spacing-xxs;
+    text-align: left;
+    width: 100%;
+
+    @include from($mobile) {
+      display: inline-flex;
+      height: $spacing-l;
+      width: auto;
+    }
+
+    &.popup-open,
+    &.ember-basic-dropdown-trigger--below {
+      color: $white;
+
+      .is-status-chevron {
+        transform: rotate(0deg);
+
+        @include from($mobile) {
+          transform: rotate(180deg);
+        }
+      }
+    }
+
+    .is-status-chevron {
+      transform: rotate(270deg);
+
+      @include from($mobile) {
+        transform: rotate(0deg);
+      }
+    }
+  }
+
+  .button .icon,
+  .button .icon:first-child:not(:last-child) {
+    flex: 0;
+    margin: 0 $spacing-xs 0 0;
+
+    @include from($mobile) {
+      margin: -$spacing-xxs;
+      margin-right: 0;
+    }
+  }
+
+  .status-menu-label {
+    flex: 1 1 auto;
+    line-height: 1;
+  }
+
+  .nav-console-button .status-menu-label,
+  .nav-user-button .status-menu-label {
+    flex: 1 1 auto;
+
+    @include from($mobile) {
+      display: none;
+    }
+  }
+}
+
+.navbar-drawer-scroll {
+  overflow: auto;
+  height: 100%;
+  -webkit-overflow-scrolling: touch;
+
+  &::before {
+    background-image: linear-gradient(
+      to bottom,
+      $ui-gray-900,
+      rgba($ui-gray-900, 0)
+    );
+    content: "";
+    height: $spacing-xs;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: $header-height;
+    z-index: 1;
+
+    @include from($mobile) {
+      display: none;
+    }
+  }
+}
+
+.navbar-drawer .ember-basic-dropdown-content {
+  @include until($mobile) {
+    position: relative;
   }
 }
diff --git a/ui/app/styles/core/tabs.scss b/ui/app/styles/core/tabs.scss
deleted file mode 100644
index 970462ae5c..0000000000
--- a/ui/app/styles/core/tabs.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-.tabs.tabs-subnav {
-  align-items: center;
-  height: 3.5rem;
-  margin-bottom: 0;
-  padding: $size-10 $size-10;
-
-  @include until($tablet) {
-    position: relative;
-    background-color: $vault-gray-800;
-    flex: 0 0 100%;
-    height: 3rem;
-  }
-
-  ul {
-    border-bottom: none;
-  }
-
-  a,
-  .link {
-    align-items: center;
-    border-bottom: none;
-    color: $white-ter;
-    cursor: pointer;
-    display: inline-flex;
-    font-weight: $font-weight-semibold;
-    line-height: 1;
-    padding: $size-10 $size-6;
-    text-decoration: none;
-    transition: color $speed, background-color $speed;
-
-    &:hover {
-      color: $white;
-    }
-  }
-  .sep:before {
-    position: relative;
-    left: -0.75em;
-  }
-
-  .is-active a,
-  .is-active .link {
-    color: $white;
-    background: rgba($black, 0.25);
-    border-radius: 4px;
-  }
-}
diff --git a/ui/app/styles/utils/_bulma_variables.scss b/ui/app/styles/utils/_bulma_variables.scss
index 16852bf611..3cee454176 100644
--- a/ui/app/styles/utils/_bulma_variables.scss
+++ b/ui/app/styles/utils/_bulma_variables.scss
@@ -19,6 +19,9 @@ $border: $grey-light;
 
 $hr-margin: 1rem 0;
 
+$mobile: 769px;
+$header-height: 4rem;
+
 //typography
 $family-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
   "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
@@ -45,6 +48,7 @@ $input-focus-background-color: $white;
 $input-border-color: $grey;
 
 $radius: 2px;
+$radius-large: 4px;
 
 //box
 $box-radius: 0;
@@ -81,6 +85,9 @@ $menu-item-active-background-color: transparent;
 $box-link-shadow: 0 0 0 1px $ui-gray-200;
 $box-link-hover-shadow: 0 0 0 1px $grey-light;
 
+// Nav
+$drawer-width: 300px;
+
 // animations
 $speed: 150ms;
 $speed-slow: $speed * 2;
diff --git a/ui/app/styles/utils/_spacing.scss b/ui/app/styles/utils/_spacing.scss
new file mode 100644
index 0000000000..029266d9c6
--- /dev/null
+++ b/ui/app/styles/utils/_spacing.scss
@@ -0,0 +1,9 @@
+// Spacing that will eventually be in Structure package
+
+$spacing-xxs: 4px;
+$spacing-xs: 8px;
+$spacing-s: 12px;
+$spacing-m: 16px;
+$spacing-l: 24px;
+$spacing-xl: 36px;
+$spacing-xxl: 48px;
diff --git a/ui/app/templates/components/auth-form.hbs b/ui/app/templates/components/auth-form.hbs
index 50ae2340d3..8b8f0a31b1 100644
--- a/ui/app/templates/components/auth-form.hbs
+++ b/ui/app/templates/components/auth-form.hbs
@@ -4,7 +4,7 @@
       {{partial 'svg/vault-loading'}}
     </div>
   {{/if}}
-  <nav class="tabs sub-nav is-marginless">
+  <nav class="tabs is-marginless">
     <ul>
       {{#each methodsToShow as |method|}}
         {{#with (or method.path method.type) as |methodKey|}}
diff --git a/ui/app/templates/components/auth-info.hbs b/ui/app/templates/components/auth-info.hbs
index 829f74c361..303d7be204 100644
--- a/ui/app/templates/components/auth-info.hbs
+++ b/ui/app/templates/components/auth-info.hbs
@@ -51,15 +51,8 @@
             Restart guide
           </button>
         </li>
-        {{#unless isOSS}}
-          <li class="action">
-            {{#link-to "vault.cluster.license" activeClusterName id="license"}}
-              License
-            {{/link-to}}
-          </li>
-        {{/unless}}
         <li class="action">
-          {{#link-to "vault.cluster.logout" activeClusterName id="logout"}}
+          {{#link-to "vault.cluster.logout" activeClusterName id="logout" invokeAction=onLinkClick}}
             Sign out
           {{/link-to}}
         </li>
diff --git a/ui/app/templates/components/console/ui-panel.hbs b/ui/app/templates/components/console/ui-panel.hbs
index 6fb219db33..369f0a733b 100644
--- a/ui/app/templates/components/console/ui-panel.hbs
+++ b/ui/app/templates/components/console/ui-panel.hbs
@@ -1,4 +1,7 @@
-<div class="console-ui-panel">
+<button type="button" class="button is-ghost console-close-button" aria-label="close console" {{action "closeConsole"}}>
+  <ICon @glyph="close" @size=16 />
+</button>
+<div class="console-ui-panel-content">
   <div class="content">
     <p class="has-text-grey is-font-mono">
       The Vault Browser CLI provides an easy way to execute the most common CLI commands, such as write, read, delete, and list.
diff --git a/ui/app/templates/components/home-link.hbs b/ui/app/templates/components/home-link.hbs
index 525ca37ae1..53690327c8 100644
--- a/ui/app/templates/components/home-link.hbs
+++ b/ui/app/templates/components/home-link.hbs
@@ -1,7 +1,7 @@
-{{#link-to 'vault.cluster' 'vault' class=class}}
+<span class={{class}}>
   {{#if hasBlock}}
     {{yield}}
   {{else}}
     {{text}}
   {{/if}}
-{{/link-to}}
+</span>
diff --git a/ui/app/templates/components/identity/entity-nav.hbs b/ui/app/templates/components/identity/entity-nav.hbs
index 41e4ccf073..adf0ab5a14 100644
--- a/ui/app/templates/components/identity/entity-nav.hbs
+++ b/ui/app/templates/components/identity/entity-nav.hbs
@@ -18,7 +18,7 @@
   </p.levelRight>
 </PageHeader>
 <div class="box is-sideless is-fullwidth is-paddingless is-marginless">
-  <nav class="tabs sub-nav">
+  <nav class="tabs">
     <ul>
       {{#link-to "vault.cluster.access.identity.index" (pluralize identityType) tagName="li"}}
         {{#link-to "vault.cluster.access.identity.index" (pluralize identityType)}}
diff --git a/ui/app/templates/components/menu-sidebar.hbs b/ui/app/templates/components/menu-sidebar.hbs
index 67203a5b00..67c8af3fb0 100644
--- a/ui/app/templates/components/menu-sidebar.hbs
+++ b/ui/app/templates/components/menu-sidebar.hbs
@@ -13,8 +13,8 @@
         {{i-con glyph="close" size=16}}
       </button>
     {{else}}
-      <button type="button" class="button is-ghost" aria-label="open menu" {{action "openMenu"}}>
-        {{i-con glyph="list" size=12}}
+      <button type="button" class="button is-ghost has-text-grey-light" aria-label="open menu" {{action "openMenu"}}>
+        <ICon @glyph="more-vertical" @size=16 />
       </button>
     {{/if}}
   </div>
diff --git a/ui/app/templates/components/mount-backend-form.hbs b/ui/app/templates/components/mount-backend-form.hbs
index 550272a14e..82361af0f5 100644
--- a/ui/app/templates/components/mount-backend-form.hbs
+++ b/ui/app/templates/components/mount-backend-form.hbs
@@ -3,7 +3,7 @@
     <h1 class="title is-3" data-test-mount-form-header=true>
       {{#if showConfig}}
         {{#with (find-by 'type' mountModel.type mountTypes) as |typeInfo|}}
-          <ICon @size=28 @glyph={{concat "enable/" (or typeInfo.glyph typeInfo.type)}} />
+          <ICon @size=24 @glyph={{concat "enable/" (or typeInfo.glyph typeInfo.type)}} @class="has-text-grey-light" />
           {{#if (eq mountType "auth")}}
             Enable {{typeInfo.displayName}} authentication method
           {{else}}
@@ -39,11 +39,11 @@
         {{#each (filter-by "category" category mountTypes) as |type|}}
           <label
             for={{type.type}}
-            class="box-radio {{if (eq mountModel.type type.type) "is-selected" }}"
+            class="box-radio{{if (eq mountModel.type type.type) " is-selected"}}"
             data-test-mount-type-radio
             data-test-mount-type={{type.type}}
           >
-            <ICon @size=36 @excludeIconClass={{true}} @glyph={{concat "enable/" (or type.glyph type.type)}} />
+            <ICon @size=36 @excludeIconClass={{true}} @glyph={{concat "enable/" (or type.glyph type.type)}} @class="has-text-grey-light" />
             {{type.displayName}}
             <RadioButton
               @value={{type.type}}
diff --git a/ui/app/templates/components/namespace-picker.hbs b/ui/app/templates/components/namespace-picker.hbs
index 4d048cf917..882e33d312 100644
--- a/ui/app/templates/components/namespace-picker.hbs
+++ b/ui/app/templates/components/namespace-picker.hbs
@@ -10,7 +10,12 @@
         @tagName="button"
         @class="button is-transparent namespace-picker-trigger has-current-color"
         >
-        {{yield}} {{#if namespaceDisplay}}<span class="namespace-name">{{namespaceDisplay}}</span>{{/if}}
+        {{yield}}
+        {{#if namespaceDisplay}}
+          <span class="namespace-name">{{namespaceDisplay}}</span>
+        {{else}}
+          <span class="namespace-name is-hidden-tablet">/ (Root)</span>
+        {{/if}}
         <ICon
           @glyph="chevron-down"
           @size=8
@@ -69,4 +74,5 @@
       </D.content>
     </BasicDropdown>
   </div>
+  <div class="navbar-separator"></div>
 {{/if}}
diff --git a/ui/app/templates/components/nav-header.hbs b/ui/app/templates/components/nav-header.hbs
index 66a7d937ff..cef1e91220 100644
--- a/ui/app/templates/components/nav-header.hbs
+++ b/ui/app/templates/components/nav-header.hbs
@@ -1,11 +1,38 @@
-<nav class="navbar has-dark-vault-gradient is-grouped-split">
+<nav class="navbar">
   <div class="navbar-brand" data-test-navheader-home>
     {{yield (hash home=(component 'nav-header/home'))}}
   </div>
-  <div class="navbar-end is-divider-list is-flex" data-test-navheader-items>
-    {{yield (hash items=(component 'nav-header/items'))}}
+
+  {{#unless navDrawerOpen}}
+    <div class="navbar-drawer-toggle is-hidden-tablet" onclick={{action "toggleNavDrawer"}}>
+      <ICon @glyph="more-vertical" @size="16" /> Menu
+    </div>
+  {{/unless}}
+
+  <div class="navbar-drawer{{if navDrawerOpen ' is-active'}}">
+    <div class="navbar-drawer-scroll">
+      <div data-test-navheader-main>
+        {{yield (hash 
+          main=(component 'nav-header/main')
+          closeDrawer=(action "toggleNavDrawer" false)
+          )
+        }}
+      </div>
+      <div class="navbar-end" data-test-navheader-items>
+        {{yield (hash 
+          items=(component 'nav-header/items')
+          closeDrawer=(action "toggleNavDrawer" false)
+          )
+        }}
+      </div>
+    </div>
+
+    {{#if navDrawerOpen}}
+      <button class=" navbar-drawer-toggle is-hidden-tablet" type="button" {{action "toggleNavDrawer" false}}>
+        <ICon @glyph="close" @size="16" />
+      </button>
+    {{/if}}
   </div>
+
+  <div class="navbar-drawer-overlay{{if navDrawerOpen ' is-active'}}" onclick={{action "toggleNavDrawer"}}></div>
 </nav>
-<div data-test-navheader-main>
-  {{yield (hash main=(component 'nav-header/main'))}}
-</div>
diff --git a/ui/app/templates/components/secret-list-header.hbs b/ui/app/templates/components/secret-list-header.hbs
index 4ae8d4d815..2c0a443791 100644
--- a/ui/app/templates/components/secret-list-header.hbs
+++ b/ui/app/templates/components/secret-list-header.hbs
@@ -16,12 +16,10 @@
     </p.top>
     <p.levelLeft>
       <h1 class="title is-3">
+        {{i-con glyph=(or (concat "enable/" model.type) "enable/secrets") size=24 class="has-text-grey-light"}}
         {{model.id}}
-        <span class="tag">
-          {{or options.displayName (capitalize model.type)}}
-        </span>
         {{#if (eq model.options.version 2)}}
-          <span class="has-text-grey-dark has-text-weight-normal is-size-6">
+          <span class="tag">
             Version 2
           </span>
         {{/if}}
@@ -56,7 +54,7 @@
   </PageHeader>
   {{#if options.tabs}}
     <div class="box is-bottomless is-marginless is-fullwidth is-paddingless">
-      <nav class="tabs sub-nav">
+      <nav class="tabs">
         <ul>
           {{#each options.tabs as |oTab|}}
             {{#if oTab.tab}}
@@ -84,7 +82,7 @@
   {{else}}
     {{!-- if there are no tabs in the options, we'll hardcode them here --}}
     <div class="box is-bottomless is-marginless is-fullwidth is-paddingless">
-      <nav class="tabs sub-nav">
+      <nav class="tabs">
         <ul>
           {{#if (contains model.engineType (supported-secret-backends))}}
             {{#link-to 'vault.cluster.secrets.backend.list-root' tagName="li" activeClass="is-active" current-when="vault.cluster.secrets.backend.list-root vault.cluster.secrets.backend.list"}}
diff --git a/ui/app/templates/components/section-tabs.hbs b/ui/app/templates/components/section-tabs.hbs
index a63ffe3654..fdecb469aa 100644
--- a/ui/app/templates/components/section-tabs.hbs
+++ b/ui/app/templates/components/section-tabs.hbs
@@ -1,7 +1,7 @@
 {{#with (tabs-for-auth-section model.type tabType) as |tabs|}}
   {{#if tabs.length}}
     <div class="box is-sideless is-fullwidth is-paddingless is-marginless">
-      <nav class="tabs sub-nav">
+      <nav class="tabs">
         <ul>
         {{#each tabs as |tab|}}
           {{#link-to params=tab.routeParams tagName="li" data-test-auth-section-tab=true}}
diff --git a/ui/app/templates/components/splash-page.hbs b/ui/app/templates/components/splash-page.hbs
index 6f1e85dc8f..0e0d5c5bd8 100644
--- a/ui/app/templates/components/splash-page.hbs
+++ b/ui/app/templates/components/splash-page.hbs
@@ -5,11 +5,9 @@
     </HomeLink>
   </Nav.home>
   <Nav.items>
-    {{#if (and activeCluster.unsealed version.isEnterprise)}}
-     <div class="navbar-item">
-       <StatusMenu @type="replication-status" @itemTag="p" />
-      </div>
-    {{/if}}
+   <div class="navbar-item status-indicator-button" data-status="{{if activeCluster.unsealed "good" "bad"}}">
+     <StatusMenu @label="Status" @onLinkClick={{action Nav.closeDrawer}} />
+   </div>
   </Nav.items>
 </NavHeader>
 <UiWizard>
diff --git a/ui/app/templates/components/status-menu.hbs b/ui/app/templates/components/status-menu.hbs
index c6ecf0100f..2efca7a9b6 100644
--- a/ui/app/templates/components/status-menu.hbs
+++ b/ui/app/templates/components/status-menu.hbs
@@ -1,29 +1,14 @@
-{{#basic-dropdown-hover horizontalPosition="auto-left" verticalPosition="below" as |d|}}
+{{#basic-dropdown-hover horizontalPosition="auto-left" verticalPosition="below" renderInPlace=media.isMobile as |d|}}
   {{#d.trigger tagName=(if (eq type "replication") "span" "button") class=(if (eq type "replication") "" "button is-transparent")}}
-    {{#if (eq type "user")}}
-      <div class="status-menu-user-trigger">
-        {{i-con
-          glyph=glyphName
-          class="has-text-grey auto-width"
-          size=18
-          aria-label=ariaLabel
-        }}
-      </div>
-      {{i-con glyph="chevron-down" aria-hidden="true" size=8 class="has-text-white auto-width is-status-chevron"}}
-    {{else if (eq type "replication")}}
-      <span class="link">
-        Replication
-      {{i-con glyph="chevron-down" aria-hidden="true" excludeIconClass=true size=8 class="auto-width is-status-chevron is-marginless"}}
-      </span>
-    {{else}}
-      {{i-con
-        glyph=glyphName
-        class="has-text-white auto-width"
-        size=20
-        aria-label=ariaLabel
-      }}
-      {{i-con glyph="chevron-down" aria-hidden="true" size=8 class="has-text-white auto-width is-status-chevron"}}
-    {{/if}}
+    {{i-con
+      glyph=glyphName
+      size=24
+      aria-label=ariaLabel
+    }}
+    <div class="status-menu-label">
+      {{label}}
+    </div>
+    <ICon @glyph="chevron-down" @size=8 @aria-hidden="true" @class="has-text-white is-status-chevron"/>
   {{/d.trigger}}
   {{#d.content class=(concat "status-menu-content status-menu-content-" type)}}
     {{partial partialName}}
diff --git a/ui/app/templates/components/text-file.hbs b/ui/app/templates/components/text-file.hbs
index 1553e14864..8f9168aeb8 100644
--- a/ui/app/templates/components/text-file.hbs
+++ b/ui/app/templates/components/text-file.hbs
@@ -57,7 +57,7 @@
           </span>
           {{#if file.fileName}}
             <button type="button" class="file-delete-button" {{action 'clearFile'}} data-test-text-clear=true>
-              {{i-con glyph="close-circled-border" size=16}}
+              <ICon @glyph="close-circled-outline" @size=16 />
             </button>
           {{/if}}
         </label>
diff --git a/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs b/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs
index 7350399649..e1a6da3b3c 100644
--- a/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs
+++ b/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs
@@ -1,36 +1,30 @@
 <div class="level is-mobile">
   <div class="level-left is-flex-1">
-    <div>
-      {{#if replicationUnsupported}}
-       Unsupported
-      {{else if (and (eq mode 'performance') (not version.hasPerfReplication))}}
-        <p>
-           Upgrade to Vault Enterprise Premium to use Performance Replication.
-        </p>
-      {{else if replicationEnabled}}
-        <span>
-          {{capitalize modeForUrl}}
-        </span>
-        {{#if secondaryId}}
-          <span class="tag">
-            <code>
-              {{secondaryId}}
-            </code>
-          </span>
-        {{/if}}
-        <span class="tag">
+    {{#if replicationUnsupported}}
+      Unsupported
+    {{else if replicationEnabled}}
+      <span>
+        {{capitalize modeForUrl}}
+      </span>
+      {{#if secondaryId}}
+        <small>
           <code>
-            {{clusterIdDisplay}}
+            {{secondaryId}}
           </code>
-        </span>
-      {{else}}
-        {{#if (eq tagName 'a')}}
-          Enable
-        {{else}}
-          Disabled
-        {{/if}}
+        </small>
       {{/if}}
-    </div>
+      <small>
+        <code>
+          {{clusterIdDisplay}}
+        </code>
+      </small>
+    {{else if (and (eq mode 'performance') (not version.hasPerfReplication))}}
+      Learn More
+    {{else if auth.currentToken}}
+      Enable {{if (eq mode 'performance') 'Performance' 'DR'}}
+    {{else}}
+      Not Enabled
+    {{/if}}
   </div>
   <div class="level-right">
     {{#if replicationEnabled}}
@@ -43,6 +37,8 @@
           {{syncProgress.progress}} of {{syncProgress.total}} keys
         </progress>
       {{/if}}
+    {{else}}
+      <ICon @glyph="neutral-circled-outline" @size="16" @class="has-text-grey-light" />
     {{/if}}
   </div>
 </div>
diff --git a/ui/app/templates/partials/secret-backend-settings/aws.hbs b/ui/app/templates/partials/secret-backend-settings/aws.hbs
index ea5224859d..19a7d01d4f 100644
--- a/ui/app/templates/partials/secret-backend-settings/aws.hbs
+++ b/ui/app/templates/partials/secret-backend-settings/aws.hbs
@@ -1,5 +1,5 @@
 <div class="box is-sideless is-fullwidth is-paddingless is-marginless">
-  <nav class="tabs sub-nav">
+  <nav class="tabs">
     <ul>
       {{#link-to "vault.cluster.settings.configure-secret-backend" model.id (query-params tab='') tagName="li"}}
         {{#link-to "vault.cluster.settings.configure-secret-backend" model.id (query-params tab='') data-test-aws-link="root-creds"}}
diff --git a/ui/app/templates/partials/secret-backend-settings/pki.hbs b/ui/app/templates/partials/secret-backend-settings/pki.hbs
index b9a3d030a9..e8bebcb159 100644
--- a/ui/app/templates/partials/secret-backend-settings/pki.hbs
+++ b/ui/app/templates/partials/secret-backend-settings/pki.hbs
@@ -1,5 +1,5 @@
 <div class="box is-bottomless is-fullwidth is-paddingless">
-  <nav class="tabs sub-nav">
+  <nav class="tabs">
     <ul>
       {{#each (array 'cert' 'urls' 'crl' 'tidy') as |section|}}
         {{#link-to 'vault.cluster.settings.configure-secret-backend.section' section tagName="li" activeClass="is-active"}}
diff --git a/ui/app/templates/partials/status/cluster.hbs b/ui/app/templates/partials/status/cluster.hbs
index 8b2fde2b0b..6bf7e674a0 100644
--- a/ui/app/templates/partials/status/cluster.hbs
+++ b/ui/app/templates/partials/status/cluster.hbs
@@ -1,14 +1,116 @@
-<div class="popup-menu-content is-wide">
+<div class="popup-menu-content">
   <div class="box">
-    <div class="menu-label">
-      In case of emergency
-    </div>
-    <div class="menu-content">
-      <p>
-        If you suspect your data has been compromised, you can
-        {{#link-to 'vault.cluster.settings.seal' cluster.name onclick=(action d.actions.close) class="link"}}seal your vault{{/link-to}}
-        to prevent access to your secrets.
-      </p>
-    </div>
+    {{#if (and activeCluster.unsealed auth.currentToken)}}
+      <nav class="menu">
+        <p class="menu-label">Replication</p>
+        <ul>
+          {{#if cluster.anyReplicationEnabled}}
+            <li>
+              {{#link-to
+                "vault.cluster.replication.mode.index"
+                "dr"
+                disabled=(not currentToken)
+                invokeAction=(action onLinkClick)
+              }}
+                {{replication-mode-summary
+                  mode="dr"
+                  display='menu'
+                  cluster=cluster
+                }}
+              {{/link-to}}
+            </li>
+            <li>
+              {{#if (has-feature "Performance Replication")}}
+                {{#link-to
+                  "vault.cluster.replication.mode.index"
+                  "performance"
+                  disabled=(not currentToken)
+                  invokeAction=(action onLinkClick)
+                }}
+                  {{replication-mode-summary
+                    mode="performance"
+                    display="menu"
+                    cluster=cluster
+                    tagName="span"
+                  }}
+                {{/link-to}}
+              {{else}}
+                {{replication-mode-summary
+                  mode="performance"
+                  display="menu"
+                  cluster=cluster
+                  class="menu-item"
+                }}
+              {{/if}}
+            </li>
+          {{else if activeCluster.version.isOSS}}
+            <li>
+              {{#link-to "vault.cluster.replication"}}
+                <div class="level is-mobile">
+                  <span class="level-left">Learn More</span>
+                  <ICon @glyph="edition-enterprise" @size="16" @class="level-right" />
+                </div>
+              {{/link-to}}
+            </li>
+          {{else}}
+            <li>
+              {{#link-to "vault.cluster.replication" 
+                invokeAction=(action onLinkClick)
+              }}
+                <div class="level is-mobile">
+                  <span class="level-left">Enable</span>
+                  <ICon @glyph="neutral-circled-outline" @size="16" @class="has-text-grey-light level-right" />
+                </div>
+              {{/link-to}}
+            </li>
+          {{/if}}
+        </ul>
+      </nav>
+      <hr/>
+    {{/if}}
+    {{#unless isOSS}}
+      <nav class="menu">
+        <div class="menu-label">
+          License
+        </div>
+        <ul class="menu-list">
+          <li class="action">
+            {{#link-to "vault.cluster.license" activeClusterName id="license" invokeAction=onLinkClick}}
+              <div class="level is-mobile">
+                <span class="level-left">See Details</span>
+              </div>
+            {{/link-to}}
+          </li>
+        </ul>
+      </nav>
+      <hr/>
+    {{/unless}}
+    <nav class="menu">
+      <div class="menu-label">
+        Seal Status
+      </div>
+      <ul class="menu-list">
+        <li class="action">
+          {{#if activeCluster.unsealed }}
+            {{#link-to 'vault.cluster.settings.seal' cluster.name
+              class="level is-mobile"
+              invokeAction=(action (queue (action onLinkClick) (action d.actions.close)))
+            }}
+              <div class="level is-mobile">
+                <span class="level-left">Unsealed</span>
+                <ICon @glyph="checkmark-circled-outline" @size="16" @class="has-text-success level-right" />
+              </div>
+            {{/link-to}}
+          {{else}}
+            <span class="menu-item">
+              <div class="level is-mobile">
+                <span class="level-left has-text-danger">Sealed</span>
+                <ICon @glyph="close-circled-outline" @size="16" @class="has-text-danger level-right" />
+              </div>
+            </span>
+          {{/if}}
+        </li>
+      </ul>
+    </nav>
   </div>
 </div>
diff --git a/ui/app/templates/partials/status/replication.hbs b/ui/app/templates/partials/status/replication.hbs
deleted file mode 100644
index 1398540777..0000000000
--- a/ui/app/templates/partials/status/replication.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-<div class="popup-menu-content is-wide is-top-nav-popup">
-  <div class="box">
-    <nav class="menu">
-      <p class="menu-label">Disaster Recovery</p>
-      <ul>
-        <li>
-          {{#link-to
-            "vault.cluster.replication.mode.index"
-            "dr"
-          }}
-            {{replication-mode-summary
-              mode="dr"
-              display='menu'
-              cluster=cluster
-              class=''
-            }}
-          {{/link-to}}
-        </li>
-      </ul>
-      <hr />
-      <p class="menu-label">Performance</p>
-      <ul>
-        <li>
-          {{#if (has-feature "Performance Replication")}}
-            {{#link-to
-              "vault.cluster.replication.mode.index"
-              "performance"
-            }}
-              {{replication-mode-summary
-                mode="performance"
-                display='menu'
-                cluster=cluster
-                tagName='span'
-              }}
-            {{/link-to}}
-          {{else}}
-            {{replication-mode-summary
-              mode="performance"
-              display='menu'
-              cluster=cluster
-              tagName='a'
-            }}
-          {{/if}}
-        </li>
-      </ul>
-    </nav>
-  </div>
-</div>
diff --git a/ui/app/templates/partials/status/user.hbs b/ui/app/templates/partials/status/user.hbs
index 575aaeab25..cc0cfe1a37 100644
--- a/ui/app/templates/partials/status/user.hbs
+++ b/ui/app/templates/partials/status/user.hbs
@@ -1,3 +1,3 @@
 {{#if (and cluster.name auth.currentToken)}}
-  {{auth-info activeClusterName=cluster.name}}
+  {{auth-info activeClusterName=cluster.name onLinkClick=(action onLinkClick)}}
 {{/if}}
diff --git a/ui/app/templates/partials/transit-form-show.hbs b/ui/app/templates/partials/transit-form-show.hbs
index 530cc40775..b7b8376236 100644
--- a/ui/app/templates/partials/transit-form-show.hbs
+++ b/ui/app/templates/partials/transit-form-show.hbs
@@ -1,5 +1,5 @@
 <div class="box is-sideless is-fullwidth is-paddingless is-marginless">
-  <nav class="tabs sub-nav">
+  <nav class="tabs">
     <ul>
       <li class="{{if (eq tab '') 'is-active'}}">
         {{#secret-link
diff --git a/ui/app/templates/svg/icons/checkmark-circled-outline.hbs b/ui/app/templates/svg/icons/checkmark-circled-outline.hbs
index 805556b804..0fc39749f9 100644
--- a/ui/app/templates/svg/icons/checkmark-circled-outline.hbs
+++ b/ui/app/templates/svg/icons/checkmark-circled-outline.hbs
@@ -1 +1,3 @@
-<path d="M256,512 C114.615104,512 0,397.384896 0,256 C0,114.615104 114.615104,0 256,0 C397.384896,0 512,114.615104 512,256 C512,397.384896 397.384896,512 256,512 Z M256,480 C379.711784,480 480,379.711784 480,256 C480,132.288216 379.711784,32 256,32 C132.288216,32 32,132.288216 32,256 C32,379.711784 132.288216,480 256,480 Z M385.548422,144 L416,174.545548 L217.753913,376.759626 L96,260.314527 L127.007564,227.142329 L217.753913,312.691266 L385.548422,144 Z"/>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.41 3.59-8 8-8s8 3.59 8 8-3.59 8-8 8-8-3.59-8-8zm3 0l1.41-1.41L11 13.17l5.59-5.59L18 9l-7 7-4-4z" />
+</svg>
diff --git a/ui/app/templates/svg/icons/close-circled-border.hbs b/ui/app/templates/svg/icons/close-circled-border.hbs
deleted file mode 100644
index f169f0f5d0..0000000000
--- a/ui/app/templates/svg/icons/close-circled-border.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<path d="M224.704 255.168L132.8 163.776l32.032-30.976 90.848 91.424 91.456-91.424 31.52 30.464-91.776 92.416 91.52 92.128-30.72 29.696-91.488-90.976-91.136 91.744-32.256-31.2 91.904-91.84v-.064zM256 512C114.615 512 0 397.385 0 256S114.615 0 256 0s256 114.615 256 256-114.615 256-256 256zm0-34.144c122.528 0 221.856-99.328 221.856-221.856 0-122.528-99.328-221.856-221.856-221.856-122.528 0-221.856 99.328-221.856 221.856 0 122.528 99.328 221.856 221.856 221.856z" fill-rule="nonzero"/>
diff --git a/ui/app/templates/svg/icons/close-circled-outline.hbs b/ui/app/templates/svg/icons/close-circled-outline.hbs
new file mode 100644
index 0000000000..2f43c9ff40
--- /dev/null
+++ b/ui/app/templates/svg/icons/close-circled-outline.hbs
@@ -0,0 +1,3 @@
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M14.59 8L12 10.59 9.41 8 8 9.41 10.59 12 8 14.59 9.41 16 12 13.41 14.59 16 16 14.59 13.41 12 16 9.41 14.59 8zM12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" />
+</svg>
diff --git a/ui/app/templates/svg/icons/console-active.hbs b/ui/app/templates/svg/icons/console-active.hbs
deleted file mode 100644
index aa155909cd..0000000000
--- a/ui/app/templates/svg/icons/console-active.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<g transform="translate(458 28)">
-  <path
-    d="M2.8,39h-409.6c-17,0-30.7,13.9-30.7,30.9V400c0,17.1,13.8,30.9,30.7,30.9H2.8c17,0,30.7-13.9,30.7-30.9 V70C33.5,52.9,19.8,39,2.8,39z"
-    fill="#0068FF"
-  />
-	<path
-    d="M2.8,18.4h-409.6c-28.3,0-51.2,23.1-51.2,51.6V400c0,28.5,22.9,51.6,51.2,51.6H2.8 c28.3,0,51.2-23.1,51.2-51.6V70C54,41.5,31.1,18.4,2.8,18.4z M33.5,400c0,17.1-13.8,30.9-30.7,30.9h-409.6 c-17,0-30.7-13.9-30.7-30.9V70c0-17.1,13.8-30.9,30.7-30.9H2.8c17,0,30.7,13.9,30.7,30.9V400z"
-    fill="#8AB1FF"
-  />
-  <polygon
-    points="-241.9,235.9 -241.7,235.7 -262.8,214.6 -263,214.8 -319.1,158.7 -340.2,179.8 -284.1,235.9 -340.2,292 -319.1,313.1 -263,257 -262.8,257.2 -241.7,236.1"
-    fill="#fff"
-  />
-	<rect
-    x="-241.7"
-    y="283.5"
-    width="157.5"
-    height="29.5"
-    fill="#fff"
-  />
-</g>
diff --git a/ui/app/templates/svg/icons/console.hbs b/ui/app/templates/svg/icons/console.hbs
index f201234cc2..5145d002ee 100644
--- a/ui/app/templates/svg/icons/console.hbs
+++ b/ui/app/templates/svg/icons/console.hbs
@@ -1,17 +1,3 @@
-<g transform="translate(458 28)">
-	<path
-    d="M2.8,18.4h-409.6c-28.3,0-51.2,23.1-51.2,51.6V400c0,28.5,22.9,51.6,51.2,51.6H2.8 c28.3,0,51.2-23.1,51.2-51.6V70C54,41.5,31.1,18.4,2.8,18.4z M33.5,400c0,17.1-13.8,30.9-30.7,30.9h-409.6 c-17,0-30.7-13.9-30.7-30.9V70c0-17.1,13.8-30.9,30.7-30.9H2.8c17,0,30.7,13.9,30.7,30.9V400z"
-    fill="#B3B9C0"
-  />
-  <polygon
-    points="-241.9,235.9 -241.7,235.7 -262.8,214.6 -263,214.8 -319.1,158.7 -340.2,179.8 -284.1,235.9 -340.2,292 -319.1,313.1 -263,257 -262.8,257.2 -241.7,236.1"
-    fill="#fff"
-  />
-  <rect
-    x="-241.7"
-    y="283.5"
-    width="157.5"
-    height="29.5"
-    fill="#fff"
-  />
-</g>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M3 3h18c1.1 0 2 .9 2 2v14c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2zm18 16V5H3v14h18zm-10-5h6v1h-6v-1zM6.47 9.522l.761-.76L10.47 12l-3.239 3.239-.761-.761L8.942 12 6.47 9.522z" fill="currentColor"/>
+</svg>
diff --git a/ui/app/templates/svg/icons/edition-enterprise.hbs b/ui/app/templates/svg/icons/edition-enterprise.hbs
index 01db35f0ec..7a8c1aa882 100644
--- a/ui/app/templates/svg/icons/edition-enterprise.hbs
+++ b/ui/app/templates/svg/icons/edition-enterprise.hbs
@@ -10,7 +10,7 @@
       <path d="M14 9.079V4.625L8 1.25 2 4.625v6.75l6 3.375 6-3.375V9.079zm-.5.264l-1 .529V5.5L8 3 3.5 5.5v4.372l-1-.529V4.875L8.001 1.75 13.5 4.875v4.468zM8.192 12.15l-.191.1L4 10.126v-4.25L8.001 3.75 12 5.875v4.25l-3.808 2.024zM8 0l7 4v8l-7 4-7-4V4l7-4zm0 13l5.5-3.1v1.2L8 14.25 2.5 11.1V9.9L8 13z"/>
     </mask>
     <g mask="url(#b)">
-      <path d="M0 0h16v16H0z" id="edition-enterprise-hexagon" fill="#7C8797"/>
+      <path d="M0 0h16v16H0z" id="edition-enterprise-hexagon" fill="#6a7786"/>
     </g>
     <path fill="url(#c)" opacity=".5" mask="url(#b)" d="M8 0l7 4v8l-7 4z"/>
   </g>
diff --git a/ui/app/templates/svg/icons/enable/approle.hbs b/ui/app/templates/svg/icons/enable/approle.hbs
index a385c40c1d..2e85b4abc6 100644
--- a/ui/app/templates/svg/icons/enable/approle.hbs
+++ b/ui/app/templates/svg/icons/enable/approle.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M14.05 34a7.04 7.04 0 0 1-.05-.833c0-4.603 4.477-8.334 10-8.334s10 3.731 10 8.334c0 .28-.017.559-.05.833h-19.9zM24 24a5 5 0 1 1 0-10 5 5 0 0 1 0 10z" id="a"/></defs><g fill="none" fill-rule="evenodd"><circle stroke="#919FA8" cx="24" cy="24" r="20.5"/><path d="M26.311 42.403l2.046-1.335 2.432.179 1.652-1.804 2.4-.436 1.153-2.16 2.217-1.022.583-2.382L40.69 31.9l-.024-2.453 1.454-1.97-.63-2.37.92-2.27-1.197-2.138.33-2.43-1.687-1.772-.282-2.436-2.072-1.294-.875-2.289-2.327-.734-1.414-1.998-2.435-.13-1.864-1.581-2.39.483L24 5.451l-2.196 1.066-2.39-.483-1.864 1.581-2.435.13-1.414 1.998-2.327.734-.875 2.29-2.072 1.293-.282 2.436-1.687 1.771.33 2.43-1.197 2.138.92 2.272-.63 2.37 1.454 1.97-.024 2.452 1.895 1.544.583 2.382 2.217 1.022 1.153 2.16 2.4.436 1.652 1.804 2.432-.179 2.046 1.335L24 41.622l2.311.78z" stroke="#919FA8"/><use fill="#919FA8" xlink:href="#a"/></g></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M7,5 L17,5 C18.1,5 19,5.9 19,7 L19,17 C19,18.1 18.1,19 17,19 L7,19 C5.9,19 5,18.1 5,17 L5,7 C5,5.9 5.9,5 7,5 Z M17,17 L17,7 L7,7 L7,17 L17,17 Z M20,11.5 L22,11.5 L22,12.5 L20,12.5 L20,11.5 Z M20,9 L22,9 L22,10 L20,10 L20,9 Z M20,14 L22,14 L22,15 L20,15 L20,14 Z M2,11.5 L4,11.5 L4,12.5 L2,12.5 L2,11.5 Z M2,9 L4,9 L4,10 L2,10 L2,9 Z M2,14 L4,14 L4,15 L2,15 L2,14 Z M11.5,2 L12.5,2 L12.5,4 L11.5,4 L11.5,2 Z M9,2 L10,2 L10,4 L9,4 L9,2 Z M14,2 L15,2 L15,4 L14,4 L14,2 Z M11.5,20 L12.5,20 L12.5,22 L11.5,22 L11.5,20 Z M9,20 L10,20 L10,22 L9,22 L9,20 Z M14,20 L15,20 L15,22 L14,22 L14,20 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/auth.hbs b/ui/app/templates/svg/icons/enable/auth.hbs
index 4331dda5d8..f3187ea9fc 100644
--- a/ui/app/templates/svg/icons/enable/auth.hbs
+++ b/ui/app/templates/svg/icons/enable/auth.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M35 40c0-6.904-6.716-12.5-15-12.5-8.284 0-15 5.596-15 12.5H0V0h40v40h-5zM20 25a7.5 7.5 0 1 0 0-15 7.5 7.5 0 0 0 0 15z" fill="#919FA8"/></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M19,3 C20.1,3 21,3.9 21,5 L21,19 C21,20.1 20.1,21 19,21 L5,21 C3.9,21 3,20.1 3,19 L3,5 C3,3.9 3.9,3 5,3 L19,3 Z M19,5 L5,5 L5,19 L19,19 L19,5 Z M15,10 C15,11.66 13.66,13 12,13 C10.34,13 9,11.66 9,10 C9,8.34 10.34,7 12,7 C13.66,7 15,8.34 15,10 Z M6,18 C6,16 10,14.9 12,14.9 C14,14.9 18,16 18,18 L18,19 L6,19 L6,18 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/cert.hbs b/ui/app/templates/svg/icons/enable/cert.hbs
index 396bf9d834..85d28f2a04 100644
--- a/ui/app/templates/svg/icons/enable/cert.hbs
+++ b/ui/app/templates/svg/icons/enable/cert.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M1 10v30h46V10H1zM0 9h48v32H0V9z" fill="#919FA8" fill-rule="nonzero"/><path fill="#919FA8" fill-rule="nonzero" d="M33 36h8v12l-4-3-4 3z"/><path fill="#FFF" d="M40 37h-6v9l3-2.25L40 46z"/><path fill="#919FA8" fill-rule="nonzero" d="M36.972 38.662L35.97 39l-.886-.578-1.054.077-.715-.781-1.04-.189-.499-.935-.96-.443-.252-1.03-.82-.67.01-1.062-.63-.852.274-1.026-.399-.984.518-.925-.143-1.052.73-.767.123-1.055.897-.56.379-.991 1.008-.318.612-.866 1.054-.056.807-.685 1.036.21.95-.462.952.462 1.035-.21.807.685 1.055.056.612.866 1.008.318.379.991.897.56.122 1.055.73.767-.142 1.052.518.925-.399.984.273 1.026-.63.852.011 1.062-.82.67-.252 1.03-.96.443-.5.935-1.04.189-.715.781-1.053-.077-.886.578z"/><path fill="#FFF" d="M38.595 37.4l.907.067.616-.673.895-.162.43-.806.827-.381.217-.888.708-.577-.01-.915.543-.736-.235-.884.344-.848-.447-.798.123-.907-.63-.662-.105-.909-.773-.482-.327-.854-.868-.274-.527-.745-.908-.048-.694-.59-.89.18-.82-.396-.817.397-.891-.18-.695.59-.908.047-.526.745-.868.274-.327.854-.773.482-.105.91-.63.66.123.908-.447.798.344.848-.235.884.542.736-.009.915.708.577.217.888.827.381.43.806.895.162.616.673.906-.067.763.497.86-.29.862.29z"/><path d="M37 37a6 6 0 1 1 0-12 6 6 0 0 1 0 12z" fill="#919FA8" fill-rule="nonzero"/><path d="M37 36a5 5 0 1 0 0-10 5 5 0 0 0 0 10z" fill="#FFF"/><path fill="#919FA8" d="M5 14h38v4H5zM5 30h12v2H5zM5 33h6v2H5z"/></g></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M11.7865865,18 L20,18 L20,6 L4,6 L4,18 L7.21341346,18 L7.09583694,17.4041631 L6.17412155,17.2222809 L6.35880959,16.3011237 L5.57685888,15.7803613 L6.1,15 L5.57685888,14.2196387 L6.35880959,13.6988763 L6.17412155,12.7777191 L7.09583694,12.5958369 L7.27771907,11.6741216 L8.19887633,11.8588096 L8.71963871,11.0768589 L9.5,11.6 L10.2803613,11.0768589 L10.8011237,11.8588096 L11.7222809,11.6741216 L11.9041631,12.5958369 L12.8258784,12.7777191 L12.6411904,13.6988763 L13.4231411,14.2196387 L12.9,15 L13.4231411,15.7803613 L12.6411904,16.3011237 L12.8258784,17.2222809 L11.9041631,17.4041631 L11.7865865,18 Z M11,20 L11,22 L9.5,21 L8,22 L8,20 L2.00001017,20 L2.00001017,4 L22.0000102,4 L22.0000102,20 L11,20 Z M9.50000509,17.000001 C10.6045774,17.000001 11.5000102,16.1045701 11.5000102,15 C11.5000102,13.8954299 10.6045774,12.999999 9.50000509,12.999999 C8.39543278,12.999999 7.5,13.8954299 7.5,15 C7.5,16.1045701 8.39543278,17.000001 9.50000509,17.000001 Z M6.00001017,8 L18,8 L18,10 L6.00001017,10 L6.00001017,8 Z M14.0000102,12 L18.0000102,12 L18.0000102,13 L14.0000102,13 L14.0000102,12 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/cubbyhole.hbs b/ui/app/templates/svg/icons/enable/cubbyhole.hbs
new file mode 100644
index 0000000000..2f48844605
--- /dev/null
+++ b/ui/app/templates/svg/icons/enable/cubbyhole.hbs
@@ -0,0 +1 @@
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M17,9 C18.1,9 19,9.9 19,11 L19,19 C19,20.1 18.1,21 17,21 L7,21 C5.9,21 5,20.1 5,19 L5,11 C5,9.9 5.9,9 7,9 L15.1,9 L15.1,7 C15.1,5.29 13.71,3.9 12,3.9 C10.6168353,3.9 9.4430363,4.8094323 9.04486465,6.06203527 L7.38213553,5.08055077 C8.1352454,3.2722657 9.919949,2 12,2 C14.76,2 17,4.24 17,7 L17,9 Z M7,19 L17,19 L17,11 L7,11 L7,19 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/database.hbs b/ui/app/templates/svg/icons/enable/database.hbs
index 1790f7991b..4b02985a40 100644
--- a/ui/app/templates/svg/icons/enable/database.hbs
+++ b/ui/app/templates/svg/icons/enable/database.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="M6 12.099C6 10 10 5 24 5s18 5 18 7.099v22.31C42 36 38 41 24 41S6 36 6 34.408v-22.31zm2.362 22.71c.486.566 1.264 1.166 2.32 1.723C13.6 38.068 18.022 39 24 39s10.401-.932 13.318-2.468c1.056-.557 1.834-1.157 2.32-1.724a2.47 2.47 0 0 0 .355-.515c.002-.005.005-7.403.007-22.194 0-.081-.12-.378-.423-.767-.472-.609-1.237-1.238-2.29-1.817C34.431 7.945 30.014 7 24 7c-6.015 0-10.432.945-13.286 2.515-1.054.58-1.819 1.208-2.291 1.817-.303.389-.423.686-.423.767v22.183c.071.147.19.325.362.526zm31.638-.4v-.127c.004 0 0 .038 0 .126zM6 27v-1h2v1c0 .669 1.105 1.86 3.18 2.847C14.022 31.2 18.173 32 23.5 32c5.346 0 9.724-.807 12.851-2.167C38.68 28.82 40 27.588 40 27v-1h2v1c0 3.584-7.856 7-18.5 7C12.965 34 6 30.683 6 27zm0-7v-1h2v1c0 .669 1.105 1.86 3.18 2.847C14.022 24.2 18.173 25 23.5 25c5.346 0 9.724-.807 12.851-2.167C38.68 21.82 40 20.588 40 20v-1h2v1c0 3.584-7.856 7-18.5 7C12.965 27 6 23.683 6 20zm0-7v-1h2v1c0 .669 1.105 1.86 3.18 2.847C14.022 17.2 18.173 18 23.5 18c5.346 0 9.724-.807 12.851-2.167C38.68 14.82 40 13.588 40 13v-1h2v1c0 3.584-7.856 7-18.5 7C12.965 20 6 16.683 6 13zm29 23a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm0-7a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm0-7a1 1 0 1 1 0-2 1 1 0 0 1 0 2z" fill="#919EA8" fill-rule="nonzero"/></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12,4.28571429 C9.05333333,4.28571429 6.66666667,4.86428571 6.66666667,5.57142857 C6.66666667,6.27857143 9.05333333,6.85714286 12,6.85714286 C14.9466667,6.85714286 17.3333333,6.27857143 17.3333333,5.57142857 C17.3333333,4.86428571 14.9466667,4.28571429 12,4.28571429 M12,10.7142857 C7.58666667,10.7142857 4,9.55714286 4,8.14285714 L4,5.57142857 C4,4.15714286 7.58666667,3 12,3 C16.4133333,3 20,4.15714286 20,5.57142857 L20,8.14285714 C20,9.55714286 16.4133333,10.7142857 12,10.7142857 M12,15.8571429 C7.58666667,15.8571429 4,14.7 4,13.2857143 L4,10.7142857 C4,10.5728571 4.05333333,10.4442857 4.12,10.3157143 C4.16,10.2385714 4.21333333,10.1485714 4.28,10.0714286 C5.17333333,11.1771429 8.28,12 12,12 C15.72,12 18.8266667,11.1771429 19.72,10.0714286 C19.7866667,10.1485714 19.84,10.2385714 19.88,10.3157143 C19.9466667,10.4442857 20,10.5857143 20,10.7142857 L20,13.2857143 C20,14.7 16.4133333,15.8571429 12,15.8571429 M12,21 C7.58666667,21 4,19.8428571 4,18.4285714 L4,15.8571429 C4,15.6385714 4.12,15.42 4.28,15.2142857 C5.17333333,16.32 8.28,17.1428571 12,17.1428571 C15.72,17.1428571 18.8266667,16.32 19.72,15.2142857 C19.8933333,15.42 20,15.6385714 20,15.8571429 L20,18.4285714 C20,19.8428571 16.4133333,21 12,21"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/generic.hbs b/ui/app/templates/svg/icons/enable/generic.hbs
new file mode 100644
index 0000000000..abfa54832d
--- /dev/null
+++ b/ui/app/templates/svg/icons/enable/generic.hbs
@@ -0,0 +1,2 @@
+{{!-- This is the same as kv.hbs --}}
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M10,18 L20,18 L20,16 L10,16 L10,18 L10,18 Z M10,13 L20,13 L20,11 L10,11 L10,13 L10,13 Z M10,6 L20,6 L20,8 L10,8 L10,6 Z M4,18 L4,16 L8,16 L8,18 L4,18 Z M4,13 L4,11 L8,11 L8,13 L4,13 Z M4,6 L8,6 L8,8 L4,8 L4,6 Z" /></svg>
\ No newline at end of file
diff --git a/ui/app/templates/svg/icons/enable/kv.hbs b/ui/app/templates/svg/icons/enable/kv.hbs
index da14bee057..96c05e5e42 100644
--- a/ui/app/templates/svg/icons/enable/kv.hbs
+++ b/ui/app/templates/svg/icons/enable/kv.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="M3 11h8v2h4v-.5h4V15h-.5v1.5H17V15h-.5v1.5H15V15h-4v2H3v-6zm1.5 1.5v3H6v-3H4.5zM7 13v2h.5v-2H7zm1-.5v3h.548v-3H8zm15 0h22v3H23v-3zM3 21h8v2h4v-.5h4V25h-.5v1.5H17V25h-.5v1.5H15V25h-4v2H3v-6zm1.5 1.5v3H6v-3H4.5zM7 23v2h.5v-2H7zm1-.5v3h.548v-3H8zm15 0h22v3H23v-3zM3 31h8v2h4v-.5h4V35h-.5v1.5H17V35h-.5v1.5H15V35h-4v2H3v-6zm1.5 1.5v3H6v-3H4.5zM7 33v2h.5v-2H7zm1-.5v3h.548v-3H8zm15 0h22v3H23v-3z" fill="#919EA8" fill-rule="evenodd"/></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M10,18 L20,18 L20,16 L10,16 L10,18 L10,18 Z M10,13 L20,13 L20,11 L10,11 L10,13 L10,13 Z M10,6 L20,6 L20,8 L10,8 L10,6 Z M4,18 L4,16 L8,16 L8,18 L4,18 Z M4,13 L4,11 L8,11 L8,13 L4,13 Z M4,6 L8,6 L8,8 L4,8 L4,6 Z" /></svg>
diff --git a/ui/app/templates/svg/icons/enable/ldap.hbs b/ui/app/templates/svg/icons/enable/ldap.hbs
new file mode 100644
index 0000000000..7fc7539b2c
--- /dev/null
+++ b/ui/app/templates/svg/icons/enable/ldap.hbs
@@ -0,0 +1,2 @@
+{{!-- same as auth.hbs --}}
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M19,3 C20.1,3 21,3.9 21,5 L21,19 C21,20.1 20.1,21 19,21 L5,21 C3.9,21 3,20.1 3,19 L3,5 C3,3.9 3.9,3 5,3 L19,3 Z M19,5 L5,5 L5,19 L19,19 L19,5 Z M15,10 C15,11.66 13.66,13 12,13 C10.34,13 9,11.66 9,10 C9,8.34 10.34,7 12,7 C13.66,7 15,8.34 15,10 Z M6,18 C6,16 10,14.9 12,14.9 C14,14.9 18,16 18,18 L18,19 L6,19 L6,18 Z"/></svg>
\ No newline at end of file
diff --git a/ui/app/templates/svg/icons/enable/pki.hbs b/ui/app/templates/svg/icons/enable/pki.hbs
index 809dc7c2a0..44c51b3226 100644
--- a/ui/app/templates/svg/icons/enable/pki.hbs
+++ b/ui/app/templates/svg/icons/enable/pki.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M29 5c1 0 1 0 2 1l9.5 11c.227.235.5.235.5 2v23c0 .7-.3 1-1 1H8c-.7 0-1-.3-1-1V6.267C7 5.567 7.3 5 8 5h21zm-.928 3H10v32l28-.235V20h-9c-.5 0-.928-.5-.928-.84V8zM30 9v9h8l-8-9zM14 32v-3h18v3H14zm0-6v-3h18v3H14zm0-6v-3h8v3h-8zm0-6v-2h3v2h-3zm5 0v-2h3v2h-3zm-5 23v-2h3v2h-3zm5 0v-2h3v2h-3zm5 0v-2h3v2h-3zm5 0v-2h3v2h-3z" id="a"/></defs><use fill="#919EA8" xlink:href="#a" fill-rule="evenodd"/></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M19.9808153,7 L20,20.5 C20,21.2857143 19.2857143,22 18.5,22 L4.5,22 C3.71428571,22 3,21.2857143 3,20.5 L3,3.5 C3,2.71428571 3.71428571,2 4.5,2 L14.9995851,2 L19.9808153,7 Z M18,7.75 L14.25,4.00066878 L5.00284417,4.00066878 L5.00284417,20 L18,20 L18,7.75 Z M7,13 L15.9218257,13 L15.9218257,11 L7,11 L7,13 Z M7,17 L15.9218257,17 L15.9218257,15 L7,15 L7,17 Z M7,9 L9,9 L9,7 L7,7 L7,9 Z M10,9 L12,9 L12,7 L10,7 L10,9 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/radius.hbs b/ui/app/templates/svg/icons/enable/radius.hbs
new file mode 100644
index 0000000000..7fc7539b2c
--- /dev/null
+++ b/ui/app/templates/svg/icons/enable/radius.hbs
@@ -0,0 +1,2 @@
+{{!-- same as auth.hbs --}}
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M19,3 C20.1,3 21,3.9 21,5 L21,19 C21,20.1 20.1,21 19,21 L5,21 C3.9,21 3,20.1 3,19 L3,5 C3,3.9 3.9,3 5,3 L19,3 Z M19,5 L5,5 L5,19 L19,19 L19,5 Z M15,10 C15,11.66 13.66,13 12,13 C10.34,13 9,11.66 9,10 C9,8.34 10.34,7 12,7 C13.66,7 15,8.34 15,10 Z M6,18 C6,16 10,14.9 12,14.9 C14,14.9 18,16 18,18 L18,19 L6,19 L6,18 Z"/></svg>
\ No newline at end of file
diff --git a/ui/app/templates/svg/icons/enable/secrets.hbs b/ui/app/templates/svg/icons/enable/secrets.hbs
new file mode 100644
index 0000000000..2f48844605
--- /dev/null
+++ b/ui/app/templates/svg/icons/enable/secrets.hbs
@@ -0,0 +1 @@
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M17,9 C18.1,9 19,9.9 19,11 L19,19 C19,20.1 18.1,21 17,21 L7,21 C5.9,21 5,20.1 5,19 L5,11 C5,9.9 5.9,9 7,9 L15.1,9 L15.1,7 C15.1,5.29 13.71,3.9 12,3.9 C10.6168353,3.9 9.4430363,4.8094323 9.04486465,6.06203527 L7.38213553,5.08055077 C8.1352454,3.2722657 9.919949,2 12,2 C14.76,2 17,4.24 17,7 L17,9 Z M7,19 L17,19 L17,11 L7,11 L7,19 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/ssh.hbs b/ui/app/templates/svg/icons/enable/ssh.hbs
index 1d097fcf57..89a271be73 100644
--- a/ui/app/templates/svg/icons/enable/ssh.hbs
+++ b/ui/app/templates/svg/icons/enable/ssh.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="M43.2 4C45.853 4 48 6.133 48 8.765v30.47C48 41.867 45.853 44 43.2 44H4.8C2.147 44 0 41.867 0 39.235V8.765C0 6.133 2.147 4 4.8 4h38.4zM45 38.16V9.84C45 8.276 43.72 7 42.132 7H5.868C4.289 7 3 8.268 3 9.84v28.32C3 39.724 4.28 41 5.868 41h36.264C43.711 41 45 39.732 45 38.16zM20.269 24.085l.018.019-1.973 1.973-.019-.019-5.246 5.247-1.973-1.973 5.246-5.247-5.246-5.246 1.973-1.973 5.246 5.246.02-.019 1.972 1.973-.018.02zm.79 4.916h14.73v2h-14.73v-2z" fill="#919EA8" fill-rule="nonzero"/></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M19.6,3 C20.9265625,3 22,4.06648199 22,5.38227147 L22,18.6177285 C22,19.933518 20.9265625,21 19.6,21 L4.4,21 C3.0734375,21 2,19.933518 2,18.6177285 L2,5.38227147 C2,4.06648199 3.0734375,3 4.4,3 L19.6,3 Z M20,17.5 L20,6.5 C20,5.71898928 19.2940552,5 18.5,5 L5.5,5 C4.71061571,5 4,5.7143951 4,6.5 L4,17.5 C4,18.2810107 4.7059448,19 5.5,19 L18.5,19 C19.2893843,19 20,18.2856049 20,17.5 Z M10.5090674,11.0343264 L11.4656736,12.0090674 L10.5,12.9566062 L7.95660622,15.5 L7,14.5433938 L9.54339378,12 L7,9.45660622 L7.95660622,8.5 L10.5090674,11.0343264 Z M12,13 L18,13 L18,15 L12,15 L12,13 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/token.hbs b/ui/app/templates/svg/icons/enable/token.hbs
index dab3c6d8a9..298ad92681 100644
--- a/ui/app/templates/svg/icons/enable/token.hbs
+++ b/ui/app/templates/svg/icons/enable/token.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M14.05 34a7.04 7.04 0 0 1-.05-.833c0-4.603 4.477-8.334 10-8.334s10 3.731 10 8.334c0 .28-.017.559-.05.833h-19.9zM24 24a5 5 0 1 1 0-10 5 5 0 0 1 0 10z" id="a"/></defs><g fill="#919FA8" fill-rule="evenodd"><path d="M24 44c11.046 0 20-8.954 20-20S35.046 4 24 4 4 12.954 4 24s8.954 20 20 20zm0 1C12.402 45 3 35.598 3 24S12.402 3 24 3s21 9.402 21 21-9.402 21-21 21z" fill-rule="nonzero"/><path d="M28.225 40.557l2.36.173 1.6-1.75 2.329-.422 1.118-2.095 2.151-.991.565-2.31 1.839-1.499-.024-2.38 1.41-1.91-.61-2.3.892-2.203-1.16-2.074.32-2.358-1.638-1.718-.273-2.363-2.01-1.255-.85-2.22-2.256-.713-1.371-1.938-2.362-.125-1.807-1.534-2.319.469L24 6.007l-2.13 1.034-2.318-.47-1.807 1.535-2.362.125-1.37 1.938-2.258.713-.849 2.22-2.01 1.255-.273 2.363-1.637 1.718.32 2.358-1.161 2.074.893 2.204-.612 2.299 1.41 1.91-.023 2.38 1.839 1.499.565 2.31 2.15.99 1.12 2.096 2.327.423 1.602 1.75 2.359-.174 1.983 1.294L24 41.094l2.242.757 1.983-1.294zM24 42.15l-2.381.805-2.108-1.375-2.505.184-1.702-1.859-2.472-.448-1.188-2.226-2.284-1.052-.6-2.453-1.952-1.59.025-2.527-1.496-2.028.649-2.44-.949-2.34 1.233-2.2-.34-2.504 1.738-1.824.29-2.509 2.134-1.332.902-2.358 2.396-.756 1.457-2.059 2.508-.133 1.92-1.63 2.463.499L24 4.895l2.262 1.099 2.463-.498 1.92 1.63 2.508.132 1.457 2.059 2.396.756.902 2.358 2.134 1.332.29 2.51 1.738 1.823-.34 2.503 1.233 2.201-.949 2.34.65 2.44-1.497 2.028.025 2.526-1.952 1.59-.6 2.454-2.284 1.052-1.188 2.226-2.472.448-1.702 1.86-2.505-.185-2.108 1.375L24 42.149z" fill-rule="nonzero"/><use xlink:href="#a"/></g></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M17.5639677,7.97393249 C19.6209457,9.19310601 21,11.4355053 21,14 C21,17.8659932 17.8659932,21 14,21 C11.4355053,21 9.19310601,19.6209457 7.97393249,17.5639677 C5.07457631,16.5270527 3,13.755798 3,10.5 C3,6.35786438 6.35786438,3 10.5,3 C13.755798,3 16.5270527,5.07457631 17.5639677,7.97393249 Z M17.984916,10.9795493 C17.7476468,14.739667 14.739667,17.7476468 10.9795493,17.984916 C11.8186783,18.6219473 12.8651897,19 14,19 C16.7614237,19 19,16.7614237 19,14 C19,12.8651897 18.6219473,11.8186783 17.9849165,10.9795405 Z M10.5,16 C13.5375661,16 16,13.5375661 16,10.5 C16,7.46243388 13.5375661,5 10.5,5 C7.46243388,5 5,7.46243388 5,10.5 C5,13.5375661 7.46243388,16 10.5,16 Z M10.5,13 C9.11928813,13 8,11.8807119 8,10.5 C8,9.11928813 9.11928813,8 10.5,8 C11.8807119,8 13,9.11928813 13,10.5 C13,11.8807119 11.8807119,13 10.5,13 Z M10.5,12 C11.3284271,12 12,11.3284271 12,10.5 C12,9.67157288 11.3284271,9 10.5,9 C9.67157288,9 9,9.67157288 9,10.5 C9,11.3284271 9.67157288,12 10.5,12 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/totp.hbs b/ui/app/templates/svg/icons/enable/totp.hbs
index 4d40a5c525..f52f70a307 100644
--- a/ui/app/templates/svg/icons/enable/totp.hbs
+++ b/ui/app/templates/svg/icons/enable/totp.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M8.718 9.597A20.941 20.941 0 0 1 24 3a20.941 20.941 0 0 1 15.282 6.597L40.5 8.379l2.121 2.121-1.432 1.433A20.904 20.904 0 0 1 45 24c0 11.598-9.402 21-21 21S3 35.598 3 24c0-4.491 1.41-8.653 3.811-12.067L5.38 10.5 7.5 8.379l1.218 1.218zM25.5 24.317l11.49 6.634-1.5 2.598L22.588 26.1H22.5v-18h3v16.217zM24 42c9.941 0 18-8.059 18-18S33.941 6 24 6 6 14.059 6 24s8.059 18 18 18zM22.5 3V1.5H21V0h6v1.5h-1.5V3h-3z" id="a"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#919EA8" fill-rule="nonzero" xlink:href="#a"/></g></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M13,3 C8.03,3 4,7.03 4,12 L1,12 L4.89,15.89 L4.96,16.03 L9,12 L6,12 C6,8.13 9.13,5 13,5 C16.87,5 20,8.13 20,12 C20,15.87 16.87,19 13,19 C11.07,19 9.32,18.21 8.06,16.94 L6.64,18.36 C8.27,19.99 10.51,21 13,21 C17.97,21 22,16.97 22,12 C22,7.03 17.97,3 13,3 L13,3 Z M12,8 L12,13 L16.28,15.54 L17,14.33 L13.5,12.25 L13.5,8 L12,8 L12,8 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/transit.hbs b/ui/app/templates/svg/icons/enable/transit.hbs
index a9395d3a67..666bf12dc5 100644
--- a/ui/app/templates/svg/icons/enable/transit.hbs
+++ b/ui/app/templates/svg/icons/enable/transit.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="M13.799 17.268l2.212 1.476-5.164 6.274H27v2.955H10.847l5.166 5.163-2.214 2.214L5 26.55l8.799-9.283zm20.449 12.814l-2.213-1.477 5.165-6.273H21v-2.955h16.2l-5.166-5.163L34.248 12l8.798 8.799-8.798 9.283z" fill="#919EA8" fill-rule="nonzero"/></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M6.99,11 L3,15 L6.99,19 L6.99,16 L14,16 L14,14 L6.99,14 L6.99,11 L6.99,11 Z M21,10 L17.01,6 L17.01,9 L10,9 L10,11 L17.01,11 L17.01,14 L21,10 L21,10 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/enable/userpass.hbs b/ui/app/templates/svg/icons/enable/userpass.hbs
index f52d8728fe..c5a319fbe8 100644
--- a/ui/app/templates/svg/icons/enable/userpass.hbs
+++ b/ui/app/templates/svg/icons/enable/userpass.hbs
@@ -1 +1 @@
-<svg width="{{size}}" height="{{size}}" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd"><g transform="translate(4 17)"><mask id="b" fill="#fff"><path d="M14 16c0-2.761-2.686-5-6-5s-6 2.239-6 5H0V0h16v16h-2zm-6-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z" id="a"/></mask><g mask="url(#b)" fill="#7C8797"><path d="M0 0h16v16H0z"/></g></g><path fill="#919FA8" d="M24 21h20v2H24z"/><rect fill="#919FA8" x="21" y="13" width="6" height="2" rx="1"/><path fill="#919FA8" d="M24 27h20v2H24z"/><path d="M1 10v30h46V10H28V8h-8v2H1zM0 9h19V7h10v2h19v32H0V9z" fill="#919FA8" fill-rule="nonzero"/></g></svg>
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M2,5 L8,5 L8,3.5 L16,3.5 L16,5 L22,5 L22,19 L2,19 L2,5 Z M4,7 L4,17 L20,17 L20,7 L14,7 L14,5 L10,5 L10,7 L4,7 Z M6,9 L12,9 L12,15 L6,15 L6,9 Z M7,10 L7,14 L11,14 L11,10 L7,10 Z M13,10.5 L18,10.5 L18,11.5 L13,11.5 L13,10.5 Z M11.5,6 L12.5,6 C12.7761424,6 13,6.22385763 13,6.5 C13,6.77614237 12.7761424,7 12.5,7 L11.5,7 C11.2238576,7 11,6.77614237 11,6.5 C11,6.22385763 11.2238576,6 11.5,6 Z M13,13 L18,13 L18,14 L13,14 L13,13 Z"/></svg>
diff --git a/ui/app/templates/svg/icons/more-vertical.hbs b/ui/app/templates/svg/icons/more-vertical.hbs
new file mode 100644
index 0000000000..dabd37967d
--- /dev/null
+++ b/ui/app/templates/svg/icons/more-vertical.hbs
@@ -0,0 +1,3 @@
+<circle cx="256" cy="64" r="64" />
+<circle cx="256" cy="256" r="64" />
+<circle cx="256" cy="448" r="64" />
diff --git a/ui/app/templates/svg/icons/neutral-circled-outline.hbs b/ui/app/templates/svg/icons/neutral-circled-outline.hbs
new file mode 100644
index 0000000000..1625846f83
--- /dev/null
+++ b/ui/app/templates/svg/icons/neutral-circled-outline.hbs
@@ -0,0 +1,3 @@
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" />
+</svg>
diff --git a/ui/app/templates/svg/icons/person.hbs b/ui/app/templates/svg/icons/person.hbs
new file mode 100644
index 0000000000..de2e977891
--- /dev/null
+++ b/ui/app/templates/svg/icons/person.hbs
@@ -0,0 +1,3 @@
+<svg width="{{size}}" height="{{size}}" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M19 5v14H5V5h14zm0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-4 7c0 1.66-1.34 3-3 3s-3-1.34-3-3 1.34-3 3-3 3 1.34 3 3zm-9 8c0-2 4-3.1 6-3.1s6 1.1 6 3.1v1H6v-1z" fill="currentColor"/>
+</svg>
diff --git a/ui/app/templates/svg/icons/status-indicator.hbs b/ui/app/templates/svg/icons/status-indicator.hbs
new file mode 100644
index 0000000000..dc4bf15302
--- /dev/null
+++ b/ui/app/templates/svg/icons/status-indicator.hbs
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path d="M8.00065107,15.0006511 C4.13465783,15.0006511 1.00065107,11.8666443 1.00065107,8.00065107 C1.00065107,4.13465783 4.13465783,1.00065107 8.00065107,1.00065107 C11.8666443,1.00065107 15.0006511,4.13465783 15.0006511,8.00065107 C15.0006511,11.8666443 11.8666443,15.0006511 8.00065107,15.0006511 Z M7.99983764,12.9999188 C10.7613062,12.9999188 12.9999188,10.7613062 12.9999188,7.99983764 C12.9999188,5.23836905 10.7613062,2.99975646 7.99983764,2.99975646 C5.23836905,2.99975646 2.99975646,5.23836905 2.99975646,7.99983764 C2.99975646,10.7613062 5.23836905,12.9999188 7.99983764,12.9999188 Z" class="status-indicator-icon-ring" fill="#525761" />
+  <circle cx="8" cy="8" r="4" class="status-indicator-icon-dot" fill="#6F7682" />
+</svg>
diff --git a/ui/app/templates/vault/cluster.hbs b/ui/app/templates/vault/cluster.hbs
index fff0f9f0a9..57201a4614 100644
--- a/ui/app/templates/vault/cluster.hbs
+++ b/ui/app/templates/vault/cluster.hbs
@@ -1,143 +1,128 @@
 {{#if showNav}}
   <NavHeader data-test-header-with-nav @class="{{if consoleOpen 'panel-open'}} {{if consoleFullscreen ' panel-fullscreen'}}" as |Nav|>
     <Nav.home>
-      {{#if (has-feature "Namespaces")}}
-        {{#if media.isMobile}}
-          <NamespacePicker
-            @class="navbar-item has-text-white has-current-color-fill"
-            @namespace={{namespaceQueryParam}}
-          >
-            {{partial 'svg/vault-logo'}}
-          </NamespacePicker>
-        {{/if}}
-      {{else}}
-        <HomeLink @class="navbar-item has-text-white has-current-color-fill">
-          {{partial 'svg/vault-logo'}}
-        </HomeLink>
-      {{/if}}
+      <HomeLink @class="navbar-item has-text-white has-current-color-fill">
+        {{partial 'svg/vault-logo'}}
+      </HomeLink>
     </Nav.home>
+    <Nav.main>
+      <ul class="navbar-sections {{if (has-feature "Namespaces") 'with-ns-picker'}}">
+        {{#if (has-feature "Namespaces")}}
+          <li>
+            <NamespacePicker
+              @class="navbar-item"
+              @namespace={{namespaceQueryParam}}
+            >
+            </NamespacePicker>
+          </li>
+        {{/if}}
+        <li class="{{if (is-active-route 'vault.cluster.secrets') 'is-active'}}" >
+          {{#link-to 
+            "vault.cluster.secrets" 
+            current-when="vault.cluster.secrets vault.cluster.settings.mount-secret-backend vault.cluster.settings.configure-secret-backend"
+            invokeAction=(action Nav.closeDrawer)
+          }}
+            Secrets
+          {{/link-to}}
+        </li>
+        <li class="{{if (is-active-route 'vault.cluster.access') 'is-active'}}">
+          {{#link-to
+            "vault.cluster.access"
+              current-when="vault.cluster.access vault.cluster.settings.auth"
+              invokeAction=(action Nav.closeDrawer)
+            }}
+            Access
+          {{/link-to}}
+        </li>
+        <li class="{{if (is-active-route (array 'vault.cluster.policies' 'vault.cluster.policy')) 'is-active'}}">
+          {{#link-to 
+            "vault.cluster.policies" 
+            "acl" 
+            current-when="vault.cluster.policies vault.cluster.policy"
+            invokeAction=(action Nav.closeDrawer)
+          }}
+            Policies
+          {{/link-to}}
+        </li>
+        <li class="{{if (is-active-route 'vault.cluster.tools') 'is-active'}}">
+          {{#link-to 
+            "vault.cluster.tools.tool"
+            "wrap"
+            invokeAction=(action Nav.closeDrawer)
+          }}
+            Tools
+          {{/link-to}}
+        </li>
+      </ul>
+    </Nav.main>
     <Nav.items>
+      <div class="navbar-separator is-hidden-tablet"></div>
+      {{#if namespaceService.inRootNamespace}}
+        <div class="navbar-item status-indicator-button" data-status="{{if activeCluster.unsealed "good" "bad"}}">
+          <StatusMenu @label="Status" @onLinkClick={{action Nav.closeDrawer}} />
+        </div>
+        <div class="navbar-separator is-hidden-mobile"></div>
+      {{/if}}
       <div class="navbar-item">
-        <button type="button" class="button is-transparent" {{action 'toggleConsole'}} data-test-console-toggle>
-          {{#if consoleOpen}}
-            {{i-con glyph="console-active" size=24}}
-            {{i-con glyph="chevron-up" aria-hidden="true" size=8 class="has-text-white auto-width is-status-chevron"}}
-          {{else}}
-            {{i-con glyph="console" size=24}}
-            {{i-con glyph="chevron-down" aria-hidden="true" size=8 class="has-text-white auto-width is-status-chevron"}}
-          {{/if}}
+        <button type="button" class="button is-transparent nav-console-button{{if consoleOpen " popup-open"}}" {{action (queue (action 'toggleConsole') (action Nav.closeDrawer))}} data-test-console-toggle>
+          <ICon @glyph="console" @size=24 />
+          <div class="status-menu-label">
+            Console
+          </div>
+          <ICon @glyph="chevron-down" @aria-hidden="true" @size=8 @class="has-text-white is-status-chevron" />
         </button>
       </div>
-      {{#if namespaceService.inRootNamespace}}
-        <div class="navbar-item">
-          {{status-menu}}
-        </div>
-      {{/if}}
-      <div class="navbar-item">
-        {{status-menu type="user"}}
+      <div class="navbar-item nav-user-button">
+        <StatusMenu @type="user" @label="User" @onLinkClick={{action Nav.closeDrawer}} />
       </div>
+      {{console/ui-panel isFullscreen=consoleFullscreen}}
     </Nav.items>
-      <Nav.main>
-        <ul class="navbar-sections tabs tabs-subnav {{if (and (has-feature "Namespaces") media.isTablet) 'with-ns-picker'}}">
-          {{#if (and (has-feature "Namespaces") media.isTablet) }}
-            <li>
-              <NamespacePicker
-                @class="navbar-item has-text-white has-current-color-fill"
-                @namespace={{namespaceQueryParam}}
-              >
-                {{partial 'svg/vault-logo'}}
-              </NamespacePicker>
-            </li>
-          {{/if}}
-          <li class="{{if (is-active-route 'vault.cluster.secrets') 'is-active'}}">
-            {{#link-to "vault.cluster.secrets"}}
-              Secrets
-            {{/link-to}}
-          </li>
-          <li class="{{if (is-active-route 'vault.cluster.access') 'is-active'}}">
-            {{#link-to "vault.cluster.access"}}
-              Access
-            {{/link-to}}
-          </li>
-          {{#if namespaceService.inRootNamespace}}
-            <li class="{{if (is-active-route 'vault.cluster.replication') 'is-active'}}">
-              {{#if activeCluster.anyReplicationEnabled}}
-                {{status-menu type="replication"}}
-              {{else}}
-                {{#link-to "vault.cluster.replication"}}
-                  Replication
-                  {{#if (is-version "OSS")}}
-                    <ICon @glyph="edition-enterprise" @size=16 @class="edition-icon" />
-                  {{/if}}
-                {{/link-to}}
-              {{/if}}
-            </li>
-          {{/if}}
-          <li class="{{if (is-active-route (array 'vault.cluster.policies' 'vault.cluster.policy')) 'is-active'}}">
-            {{#link-to "vault.cluster.policies" "acl" current-when="vault.cluster.policies vault.cluster.policy"}}
-              Policies
-            {{/link-to}}
-          </li>
-          <li class="{{if (is-active-route 'vault.cluster.tools') 'is-active'}}">
-            {{#link-to "vault.cluster.tools.tool" "wrap"}}
-              Tools
-            {{/link-to}}
-          </li>
-          <li class="{{if (is-active-route 'vault.cluster.settings') 'is-active'}}">
-            {{#link-to "vault.cluster.settings"}}
-              Settings
-            {{/link-to}}
-          </li>
-        </ul>
-        {{console/ui-panel isFullscreen=consoleFullscreen}}
-      </Nav.main>
-    </NavHeader>
-  {{/if}}
-  <div class="global-flash">
-    {{#each flashMessages.queue as |flash|}}
-      {{#flash-message data-test-flash-message=true flash=flash as |component flash close|}}
-        {{#if flash.componentName}}
-          {{component flash.componentName content=flash.content}}
-        {{else}}
-          <h5 class="title is-5 has-text-{{if (eq flash.type 'warning') 'dark-yellow' flash.type}}">
-            {{get (message-types flash.type) "text"}}
-          </h5>
-          <span data-test-flash-message-body=true>
-            {{flash.message}}
-          </span>
-          <button type="button" class="delete" {{action close}}>
-            {{i-con excludeIconClass=true glyph="close" aria-label="Close"}}
-          </button>
-        {{/if}}
-      {{/flash-message}}
-    {{/each}}
-  </div>
-  {{#if showNav}}
-    <UiWizard>
-      <section class="section">
-        <div class="container is-widescreen">
-          {{component
-            (if
-              (or
-                (is-after (now interval=1000) auth.tokenExpirationDate)
-                (and activeClusterName auth.currentToken)
-              )
-              'token-expire-warning'
-              null
-            )
-          }}
-          {{#unless (and
-              activeClusterName
-              auth.currentToken
+  </NavHeader>
+{{/if}}
+<div class="global-flash">
+  {{#each flashMessages.queue as |flash|}}
+    {{#flash-message data-test-flash-message=true flash=flash as |component flash close|}}
+      {{#if flash.componentName}}
+        {{component flash.componentName content=flash.content}}
+      {{else}}
+        <h5 class="title is-5 has-text-{{if (eq flash.type 'warning') 'dark-yellow' flash.type}}">
+          {{get (message-types flash.type) "text"}}
+        </h5>
+        <span data-test-flash-message-body=true>
+          {{flash.message}}
+        </span>
+        <button type="button" class="delete" {{action close}}>
+          {{i-con excludeIconClass=true glyph="close" aria-label="Close"}}
+        </button>
+      {{/if}}
+    {{/flash-message}}
+  {{/each}}
+</div>
+{{#if showNav}}
+  <UiWizard>
+    <section class="section">
+      <div class="container is-widescreen">
+        {{component
+          (if
+            (or
               (is-after (now interval=1000) auth.tokenExpirationDate)
+              (and activeClusterName auth.currentToken)
             )
-          }}
-            {{outlet}}
-          {{/unless}}
-        </div>
-      </section>
-    </UiWizard>
-  {{else}}
-    {{outlet}}
-  {{/if}}
-
+            'token-expire-warning'
+            null
+          )
+        }}
+        {{#unless (and
+            activeClusterName
+            auth.currentToken
+            (is-after (now interval=1000) auth.tokenExpirationDate)
+          )
+        }}
+          {{outlet}}
+        {{/unless}}
+      </div>
+    </section>
+  </UiWizard>
+{{else}}
+  {{outlet}}
+{{/if}}
diff --git a/ui/app/templates/vault/cluster/access.hbs b/ui/app/templates/vault/cluster/access.hbs
index 4eb541a449..dce9fc4dd0 100644
--- a/ui/app/templates/vault/cluster/access.hbs
+++ b/ui/app/templates/vault/cluster/access.hbs
@@ -31,7 +31,7 @@
       {{/link-to}}
     </li>
     <li>
-      {{#link-to "vault.cluster.access.control-groups" data-test-link=true current-when="vault.cluster.access.control-groups vault.cluster.access.control-group-accessor"}}
+      {{#link-to "vault.cluster.access.control-groups" data-test-link=true current-when="vault.cluster.access.control-groups vault.cluster.access.control-group-accessor vault.cluster.access.control-groups-configure"}}
         Control Groups
         {{#unless (has-feature "Control Groups")}}
           {{#if (is-version "OSS")}}
diff --git a/ui/app/templates/vault/cluster/access/control-group-accessor.hbs b/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
index 1c43e9bc11..bb51e93ff5 100644
--- a/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
+++ b/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
@@ -7,7 +7,7 @@
     </p.levelLeft>
     <p.levelRight>
       {{#if model.canConfigure}}
-        {{#link-to 'vault.cluster.settings.control-groups' class="button has-icon-right is-ghost is-compact"}}
+        {{#link-to 'vault.cluster.access.control-groups-configure' class="button has-icon-right is-ghost is-compact"}}
           Configure
           <ICon @glyph="chevron-right" @size=11 />
         {{/link-to}}
diff --git a/ui/app/templates/vault/cluster/settings/control-groups.hbs b/ui/app/templates/vault/cluster/access/control-groups-configure.hbs
similarity index 100%
rename from ui/app/templates/vault/cluster/settings/control-groups.hbs
rename to ui/app/templates/vault/cluster/access/control-groups-configure.hbs
diff --git a/ui/app/templates/vault/cluster/access/control-groups.hbs b/ui/app/templates/vault/cluster/access/control-groups.hbs
index 2e5b59ecd2..ed8a0108b0 100644
--- a/ui/app/templates/vault/cluster/access/control-groups.hbs
+++ b/ui/app/templates/vault/cluster/access/control-groups.hbs
@@ -7,7 +7,7 @@
     </p.levelLeft>
     <p.levelRight>
       {{#if model.canConfigure}}
-        {{#link-to 'vault.cluster.settings.control-groups' class="button has-icon-right is-ghost is-compact"}}
+        {{#link-to 'vault.cluster.access.control-groups-configure' class="button has-icon-right is-ghost is-compact"}}
           Configure
           <ICon @glyph="chevron-right" @size=11 />
         {{/link-to}}
diff --git a/ui/app/templates/vault/cluster/access/methods.hbs b/ui/app/templates/vault/cluster/access/methods.hbs
index 6fc65846a2..728b49717d 100644
--- a/ui/app/templates/vault/cluster/access/methods.hbs
+++ b/ui/app/templates/vault/cluster/access/methods.hbs
@@ -20,18 +20,25 @@
     <div class="level is-mobile">
       <div class="level-left">
         <div>
-          {{i-con glyph="folder" size=14 class="has-text-grey-light"}}
+          <ToolTip @horizontalPosition="left" as |T|>
+            <T.trigger>
+              <ICon @glyph={{concat "enable/" (or method.type "auth")}} @size=24 @class="has-text-grey-light"/>
+            </T.trigger>
+            <T.content @class="tool-tip">
+              <div class="box">
+                {{method.methodType}}
+              </div>
+            </T.content>
+          </ToolTip>
           <span data-test-path data-test-id={{method.id}} class="has-text-weight-semibold has-text-grey">
             {{method.path}}
           </span>
           <br />
-          <span class="tag">
-            {{#if (eq method.methodType 'plugin')}}
+          {{#if (eq method.methodType 'plugin')}}
+            <span class="tag">
               {{method.methodType}}: {{method.config.plugin_name}}
-            {{else}}
-              {{method.methodType}}
-            {{/if}}
-          </span>
+            </span>
+          {{/if}}
           <code class="has-text-grey is-size-8">
             {{method.accessor}}
           </code>
diff --git a/ui/app/templates/vault/cluster/secrets/backends.hbs b/ui/app/templates/vault/cluster/secrets/backends.hbs
index ff7cc792e4..ba2b492e64 100644
--- a/ui/app/templates/vault/cluster/secrets/backends.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backends.hbs
@@ -22,18 +22,28 @@
     <div class="level is-mobile">
       <div class="level-left">
         <div>
+          <ToolTip @horizontalPosition="left" as |T|>
+            <T.trigger>
+              <ICon @glyph={{concat "enable/" (or backend.type "secrets")}} @size=24 @class="has-text-grey-light"/>
+            </T.trigger>
+            <T.content @class="tool-tip">
+              <div class="box">
+                {{backend.type}}
+              </div>
+            </T.content>
+          </ToolTip>
           {{#link-to "vault.cluster.secrets.backend.list-root" backend.id
              class="has-text-black has-text-weight-semibold"
              data-test-secret-path=true
-           }}{{i-con glyph="folder" size=14 class="has-text-grey-light"}}{{backend.path}}{{/link-to}}
+           }}
+            {{backend.path}}
+          {{/link-to}}
           <br />
-          <span class="tag">
-            {{#if (eq backend.type 'plugin')}}
+          {{#if (eq backend.type 'plugin')}}
+            <span class="tag">
               {{backend.type}}: {{backend.config.plugin_name}}
-            {{else}}
-              {{backend.type}}
-            {{/if}}
-          </span>
+            </span>
+          {{/if}}
           <code class="has-text-grey is-size-8">
           {{#if (eq backend.options.version 2)}}
             v2
@@ -73,17 +83,23 @@
       <div class="level-left">
         <div>
           <div data-test-secret-path class="has-text-weight-semibold has-text-grey">
-            {{i-con glyph="folder" size=14 class="has-text-grey-light"}} {{backend.path}}
+            <ToolTip @horizontalPosition="left" as |T|>
+              <T.trigger>
+                <ICon @glyph={{concat "enable/" (or backend.type "secrets")}} @size=24 @class="has-text-grey-light"/>
+              </T.trigger>
+              <T.content @class="tool-tip">
+                <div class="box">
+                  {{backend.type}}
+                </div>
+              </T.content>
+            </ToolTip>
+            {{backend.path}}
           </div>
-          <span class="tag">
-            <code>
-              {{#if (eq backend.type 'plugin')}}
-                {{backend.type}}: {{backend.config.plugin_name}}
-              {{else}}
-                {{backend.type}}
-              {{/if}}
-            </code>
-          </span>
+          {{#if (eq backend.type 'plugin')}}
+            <span class="tag">
+              {{backend.type}}: {{backend.config.plugin_name}}
+            </span>
+          {{/if}}
           <code class="has-text-grey is-size-8">
             {{backend.accessor}}
           </code>
diff --git a/ui/app/templates/vault/cluster/settings.hbs b/ui/app/templates/vault/cluster/settings.hbs
index b29d2c022f..e2147cab02 100644
--- a/ui/app/templates/vault/cluster/settings.hbs
+++ b/ui/app/templates/vault/cluster/settings.hbs
@@ -1,37 +1 @@
-<div class="columns">
-  {{#menu-sidebar title="Settings" class="is-3"}}
-    <li>
-      {{#link-to "vault.cluster.settings.mount-secret-backend" current-when="vault.cluster.settings.mount-secret-backend vault.cluster.settings.configure-secret-backend"}}
-        Secrets Engines
-      {{/link-to}}
-    </li>
-    <li>
-      {{#link-to "vault.cluster.settings.auth"}}
-        Auth Methods
-      {{/link-to}}
-    </li>
-     <li>
-      {{#link-to "vault.cluster.settings.control-groups" data-test-link=true}}
-        Control Groups
-
-        {{#unless (has-feature "Control Groups")}}
-          {{#if (is-version "OSS")}}
-            {{edition-badge edition="Enterprise"}}
-          {{else}}
-            {{edition-badge edition="Premium"}}
-          {{/if}}
-        {{/unless}}
-      {{/link-to}}
-    </li>
-    {{#if namespaceService.inRootNamespace}}
-      <li>
-        {{#link-to "vault.cluster.settings.seal"}}
-          Seal
-        {{/link-to}}
-      </li>
-    {{/if}}
-  {{/menu-sidebar}}
-  <div class="column is-9">
-    {{outlet}}
-  </div>
-</div>
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/not-found.hbs b/ui/app/templates/vault/not-found.hbs
index adb5cdbb73..502b5971be 100644
--- a/ui/app/templates/vault/not-found.hbs
+++ b/ui/app/templates/vault/not-found.hbs
@@ -1,5 +1,5 @@
 <header>
-  <nav class="navbar has-dark-vault-gradient is-grouped-split">
+  <nav class="navbar is-grouped-split">
     <div class="navbar-brand">
       {{#home-link class="navbar-item has-text-white has-current-color-fill"}}
         {{partial 'svg/vault-logo'}}
diff --git a/ui/package.json b/ui/package.json
index 5ae64d6ff5..7e5da5c71f 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -85,6 +85,7 @@
     "ember-export-application-global": "^2.0.0",
     "ember-fetch": "^3.4.3",
     "ember-inflector": "^3.0.0",
+    "ember-link-action": "^0.1.2",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-maybe-in-element": "^0.1.3",
diff --git a/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js b/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js
index b15ce4dc6d..3a37ecca68 100644
--- a/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/cubbyhole/secret-test.js
@@ -26,12 +26,6 @@ module('Acceptance | secrets/cubbyhole/create', function(hooks) {
 
     await listPage.create();
     await editPage.createSecret(kvPath, 'foo', 'bar');
-    let capabilitiesReq = this.server.passthroughRequests.findBy('url', '/v1/sys/capabilities-self');
-    assert.equal(
-      JSON.parse(capabilitiesReq.requestBody).paths,
-      `cubbyhole/${kvPath}`,
-      'calls capabilites with the correct path'
-    );
     assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'redirects to the show page');
     assert.ok(showPage.editIsPresent, 'shows the edit button');
   });
diff --git a/ui/yarn.lock b/ui/yarn.lock
index ff36e5e227..7d0533a66c 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -2,6 +2,529 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/core@^7.0.0":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.2.tgz#f8d2a9ceb6832887329a7b60f9d035791400ba4e"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.1.2"
+    "@babel/helpers" "^7.1.2"
+    "@babel/parser" "^7.1.2"
+    "@babel/template" "^7.1.2"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.1.2"
+    convert-source-map "^1.1.0"
+    debug "^3.1.0"
+    json5 "^0.5.0"
+    lodash "^4.17.10"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.1.2", "@babel/generator@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673"
+  dependencies:
+    "@babel/types" "^7.1.3"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-annotate-as-pure@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-call-delegate@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-define-map@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    lodash "^4.17.10"
+
+"@babel/helper-explode-assignable-expression@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+  dependencies:
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-get-function-arity@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-hoist-variables@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-member-expression-to-functions@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-module-imports@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-module-transforms@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    lodash "^4.17.10"
+
+"@babel/helper-optimise-call-expression@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-plugin-utils@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+
+"@babel/helper-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+  dependencies:
+    lodash "^4.17.10"
+
+"@babel/helper-remap-async-to-generator@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-wrap-function" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-replace-supers@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-simple-access@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+  dependencies:
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-split-export-declaration@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-wrap-function@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helpers@^7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.2.tgz#ab752e8c35ef7d39987df4e8586c63b8846234b5"
+  dependencies:
+    "@babel/template" "^7.1.2"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.1.2"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.2", "@babel/parser@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
+
+"@babel/plugin-proposal-async-generator-functions@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/plugin-syntax-async-generators" "^7.0.0"
+
+"@babel/plugin-proposal-json-strings@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-json-strings" "^7.0.0"
+
+"@babel/plugin-proposal-object-rest-spread@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.2.0"
+
+"@babel/plugin-syntax-async-generators@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-json-strings@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-object-rest-spread@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-arrow-functions@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-async-to-generator@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.1.0"
+
+"@babel/plugin-transform-block-scoped-functions@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-block-scoping@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    lodash "^4.17.10"
+
+"@babel/plugin-transform-classes@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-define-map" "^7.1.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-destructuring@^7.0.0":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.3.tgz#e69ff50ca01fac6cb72863c544e516c2b193012f"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-dotall-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.1.3"
+
+"@babel/plugin-transform-duplicate-keys@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-exponentiation-operator@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-for-of@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-literals@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-modules-amd@^7.0.0", "@babel/plugin-transform-modules-amd@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8"
+  dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-modules-commonjs@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
+  dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
+
+"@babel/plugin-transform-modules-systemjs@^7.0.0":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.1.3.tgz#2119a3e3db612fd74a19d88652efbfe9613a5db0"
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-modules-umd@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8"
+  dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-new-target@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-object-super@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
+
+"@babel/plugin-transform-parameters@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
+  dependencies:
+    "@babel/helper-call-delegate" "^7.1.0"
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-regenerator@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
+  dependencies:
+    regenerator-transform "^0.13.3"
+
+"@babel/plugin-transform-shorthand-properties@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-spread@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-sticky-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+
+"@babel/plugin-transform-template-literals@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-typeof-symbol@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-unicode-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.1.3"
+
+"@babel/polyfill@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.0.0.tgz#c8ff65c9ec3be6a1ba10113ebd40e8750fb90bff"
+  dependencies:
+    core-js "^2.5.7"
+    regenerator-runtime "^0.11.1"
+
+"@babel/preset-env@^7.0.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11"
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.1.0"
+    "@babel/plugin-proposal-json-strings" "^7.0.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.0.0"
+    "@babel/plugin-syntax-async-generators" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
+    "@babel/plugin-transform-arrow-functions" "^7.0.0"
+    "@babel/plugin-transform-async-to-generator" "^7.1.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
+    "@babel/plugin-transform-block-scoping" "^7.0.0"
+    "@babel/plugin-transform-classes" "^7.1.0"
+    "@babel/plugin-transform-computed-properties" "^7.0.0"
+    "@babel/plugin-transform-destructuring" "^7.0.0"
+    "@babel/plugin-transform-dotall-regex" "^7.0.0"
+    "@babel/plugin-transform-duplicate-keys" "^7.0.0"
+    "@babel/plugin-transform-exponentiation-operator" "^7.1.0"
+    "@babel/plugin-transform-for-of" "^7.0.0"
+    "@babel/plugin-transform-function-name" "^7.1.0"
+    "@babel/plugin-transform-literals" "^7.0.0"
+    "@babel/plugin-transform-modules-amd" "^7.1.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.1.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.0.0"
+    "@babel/plugin-transform-modules-umd" "^7.1.0"
+    "@babel/plugin-transform-new-target" "^7.0.0"
+    "@babel/plugin-transform-object-super" "^7.1.0"
+    "@babel/plugin-transform-parameters" "^7.1.0"
+    "@babel/plugin-transform-regenerator" "^7.0.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
+    "@babel/plugin-transform-spread" "^7.0.0"
+    "@babel/plugin-transform-sticky-regex" "^7.0.0"
+    "@babel/plugin-transform-template-literals" "^7.0.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.0.0"
+    "@babel/plugin-transform-unicode-regex" "^7.0.0"
+    browserslist "^4.1.0"
+    invariant "^2.2.2"
+    js-levenshtein "^1.1.3"
+    semver "^5.3.0"
+
+"@babel/template@^7.1.0", "@babel/template@^7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.1.2"
+    "@babel/types" "^7.1.2"
+
+"@babel/traverse@^7.1.0":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.1.3"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/parser" "^7.1.3"
+    "@babel/types" "^7.1.3"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
+"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
+
 "@ember/jquery@^0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@ember/jquery/-/jquery-0.5.2.tgz#fe312c03ada0022fa092d23f7cd7e2eb0374b53a"
@@ -966,6 +1489,12 @@ babel-plugin-ember-modules-api-polyfill@^2.4.0:
   dependencies:
     ember-rfc176-data "^0.3.4"
 
+babel-plugin-ember-modules-api-polyfill@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.5.0.tgz#860aab9fecbf38c10d1fe0779c6979a854fff154"
+  dependencies:
+    ember-rfc176-data "^0.3.5"
+
 babel-plugin-feature-flags@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz#9c827cf9a4eb9a19f725ccb239e85cab02036fc1"
@@ -978,6 +1507,16 @@ babel-plugin-htmlbars-inline-precompile@^0.2.5:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.2.6.tgz#c00b8a3f4b32ca04bf0f0d5169fcef3b5a66d69d"
 
+babel-plugin-module-resolver@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.1.1.tgz#881cf67e3d4b8400d5eaaefc1be44d2dc1fe404f"
+  dependencies:
+    find-babel-config "^1.1.0"
+    glob "^7.1.2"
+    pkg-up "^2.0.0"
+    reselect "^3.0.1"
+    resolve "^1.4.0"
+
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -1583,6 +2122,21 @@ broccoli-babel-transpiler@^6.5.0:
     rsvp "^4.8.2"
     workerpool "^2.3.0"
 
+broccoli-babel-transpiler@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.0.0.tgz#bc9d0e93d70d9515b799144b54b0b958e88b6f19"
+  dependencies:
+    "@babel/core" "^7.0.0"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^3.0.0"
+    broccoli-persistent-filter "^1.4.3"
+    clone "^2.1.2"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.9"
+    json-stable-stringify "^1.0.1"
+    rsvp "^4.8.3"
+    workerpool "^2.3.1"
+
 broccoli-builder@^0.18.14:
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
@@ -2089,6 +2643,14 @@ browserslist@^3.1.1, browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
+browserslist@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.2.1.tgz#257a24c879d1cd4016348eee5c25de683260b21d"
+  dependencies:
+    caniuse-lite "^1.0.30000890"
+    electron-to-chromium "^1.3.79"
+    node-releases "^1.0.0-alpha.14"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -2301,6 +2863,10 @@ caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.300008
   version "1.0.30000885"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz#e889e9f8e7e50e769f2a49634c932b8aee622984"
 
+caniuse-lite@^1.0.30000890:
+  version "1.0.30000893"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000893.tgz#284b20932bd41b93e21626975f2050cb01561986"
+
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
@@ -2561,7 +3127,7 @@ clone@^1.0.0, clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
-clone@^2.0.0:
+clone@^2.0.0, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
 
@@ -2848,7 +3414,7 @@ conventional-commits-parser@^3.0.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@^1.5.1:
+convert-source-map@^1.1.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
   dependencies:
@@ -2885,7 +3451,7 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
 
@@ -3366,6 +3932,10 @@ electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
   version "1.3.64"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.64.tgz#39f5a93bf84ab7e10cfbb7522ccfc3f1feb756cf"
 
+electron-to-chromium@^1.3.79:
+  version "1.3.79"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.79.tgz#774718f06284a4bf8f578ac67e74508fe659f13a"
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3487,6 +4057,27 @@ ember-cli-babel@^6.16.0:
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
+ember-cli-babel@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.1.2.tgz#543c64368d6138d12656db1143c02df1f2b0ee9c"
+  dependencies:
+    "@babel/core" "^7.0.0"
+    "@babel/plugin-transform-modules-amd" "^7.0.0"
+    "@babel/polyfill" "^7.0.0"
+    "@babel/preset-env" "^7.0.0"
+    amd-name-resolver "1.2.0"
+    babel-plugin-debug-macros "^0.2.0-beta.6"
+    babel-plugin-ember-modules-api-polyfill "^2.5.0"
+    babel-plugin-module-resolver "^3.1.1"
+    broccoli-babel-transpiler "^7.0.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.1"
+    broccoli-source "^1.1.0"
+    clone "^2.1.2"
+    ember-cli-version-checker "^2.1.2"
+    ensure-posix-path "^1.0.2"
+    semver "^5.5.0"
+
 ember-cli-broccoli-sane-watcher@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-2.1.1.tgz#1687adada9022de26053fba833dc7dd10f03dd08"
@@ -4021,6 +4612,12 @@ ember-inflector@^3.0.0:
   dependencies:
     ember-cli-babel "^6.6.0"
 
+ember-link-action@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ember-link-action/-/ember-link-action-0.1.2.tgz#ef721eb4863e949f12b012e9afcdeeddd6a6a309"
+  dependencies:
+    ember-cli-babel "^7.1.0"
+
 ember-load-initializers@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-1.1.0.tgz#4edacc0f3a14d9f53d241ac3e5561804c8377978"
@@ -4122,6 +4719,10 @@ ember-rfc176-data@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.4.tgz#566fd3b7192d02a9a0bfe7e22bbaa4d3a1682e4a"
 
+ember-rfc176-data@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.5.tgz#f630e550572c81a5e5c7220f864c0f06eee9e977"
+
 ember-router-generator@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee"
@@ -4882,6 +5483,13 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
+find-babel-config@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355"
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -5385,6 +5993,10 @@ globals@^11.0.1:
   version "11.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
 
+globals@^11.1.0:
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
+
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -6344,6 +6956,10 @@ js-base64@^2.1.8:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
 
+js-levenshtein@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
+
 js-reporters@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.1.tgz#f88c608e324a3373a95bcc45ad305e5c979c459b"
@@ -6352,7 +6968,7 @@ js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
 
-"js-tokens@^3.0.0 || ^4.0.0":
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
@@ -6410,7 +7026,7 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
-jsesc@^2.5.0:
+jsesc@^2.5.0, jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
 
@@ -7934,6 +8550,12 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
+node-releases@^1.0.0-alpha.14:
+  version "1.0.0-alpha.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.14.tgz#da9e2780add4bbb59ad890af9e2018a1d9c0034b"
+  dependencies:
+    semver "^5.3.0"
+
 node-rest-client@^1.5.1:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/node-rest-client/-/node-rest-client-1.8.0.tgz#8d3c566b817e27394cb7273783a41caefe3e5955"
@@ -9373,7 +9995,13 @@ redeyed@~2.1.0:
   dependencies:
     esprima "~4.0.0"
 
-regenerate@^1.2.1:
+regenerate-unicode-properties@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.2.1, regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
@@ -9381,7 +10009,7 @@ regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
-regenerator-runtime@^0.11.0:
+regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
@@ -9397,6 +10025,12 @@ regenerator-transform@^0.10.0:
     babel-types "^6.19.0"
     private "^0.1.6"
 
+regenerator-transform@^0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
+  dependencies:
+    private "^0.1.6"
+
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -9422,6 +10056,17 @@ regexpu-core@^2.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
+regexpu-core@^4.1.3, regexpu-core@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^7.0.0"
+    regjsgen "^0.4.0"
+    regjsparser "^0.3.0"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.0.2"
+
 registry-auth-token@^3.0.1, registry-auth-token@^3.3.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
@@ -9439,12 +10084,22 @@ regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
 
+regjsgen@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
+
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
+  dependencies:
+    jsesc "~0.5.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -9560,6 +10215,10 @@ requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+
 reserved-words@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"
@@ -9604,7 +10263,7 @@ resolve@1.5.0:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.1.3, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.7.1, resolve@^1.8.1:
+resolve@^1.1.3, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.7.1, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -10206,7 +10865,7 @@ source-map@0.4.x, source-map@^0.4.2:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -10759,6 +11418,10 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
 to-ico@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/to-ico/-/to-ico-1.1.5.tgz#1d32da5f2c90922edee6b686d610c54527b5a8d5"
@@ -10966,6 +11629,25 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -11402,6 +12084,12 @@ workerpool@^2.3.0:
   dependencies:
     object-assign "4.1.1"
 
+workerpool@^2.3.1:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7"
+  dependencies:
+    object-assign "4.1.1"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"