diff --git a/ui-v2/app/components/consul-kind/index.hbs b/ui-v2/app/components/consul-kind/index.hbs
index 2d7bbce76e..0b1b84a6c2 100644
--- a/ui-v2/app/components/consul-kind/index.hbs
+++ b/ui-v2/app/components/consul-kind/index.hbs
@@ -1,11 +1,93 @@
 {{#if item.Kind}}
-  {{#if (has-block)}}
-    {{yield
-      (component 'consul-kind' item=item)
-    }}
-  {{else}}
-    <span data-test-kind={{item.Kind}} class="consul-kind gateway">
-        <span>{{titleize (humanize item.Kind)}}</span>
-    </span>
-  {{/if}}
+  {{#let (titleize (humanize item.Kind)) as |Name|}}
+    {{#if (has-block)}}
+      {{yield
+        (component 'consul-kind' item=item withInfo=withInfo)
+      }}
+    {{else}}
+    {{#if withInfo}}
+        <dl class="tooltip-panel">
+          <dt>
+            <span data-test-kind={{item.Kind}} class="consul-kind gateway">
+                <span>{{Name}}</span>
+            </span>
+          </dt>
+          <dd>
+            <MenuPanel @position="left">
+              <BlockSlot @name="header">
+                {{#if (eq item.Kind 'ingress-gateway')}}
+                  Ingress gateways enable ingress traffic from services outside the Consul service mesh to services inside the Consul service mesh.
+                {{else if (eq item.Kind 'terminating-gateway')}}
+                  Terminating gateways allow connect-enabled services in Consul service mesh to communicate with services outside the service mesh.
+                {{else}}
+                  Mesh gateways enable routing of Connect traffic between different Consul datacenters.
+                {{/if}}
+              </BlockSlot>
+              <BlockSlot @name="menu">
+                <li role="separator">
+                  {{#if (eq item.Kind 'ingress-gateway')}}
+                      About Ingress gateways
+                  {{else if (eq item.Kind 'terminating-gateway')}}
+                      About Terminating gateways
+                  {{else}}
+                      About Mesh gateways
+                  {{/if}}
+                </li>
+          {{#let (from-entries
+            (array 'ingress-gateway' '/consul/developer-mesh/ingress-gateways')
+            (array 'terminating-gateway' '/consul/developer-mesh/understand-terminating-gateways')
+            (array 'mesh-gateway' '/consul/developer-mesh/connect-gateways')
+          ) as |link|}}
+                <li role="none" class="learn-link">
+                  <a tabindex="-1" role="menuitem" href={{concat (env 'CONSUL_DOCS_LEARN_URL') (get link item.Kind)}} rel="noopener noreferrer" target="_blank">
+                    Learn guides
+                  </a>
+                </li>
+          {{/let}}
+          {{#let (from-entries
+            (array 'ingress-gateway' '/connect/ingress_gateway.html')
+            (array 'terminating-gateway' '/connect/terminating_gateway.html')
+            (array 'mesh-gateway' '/connect/mesh_gateway.html')
+          ) as |link|}}
+                <li role="none" class="docs-link">
+                  <a tabindex="-1" role="menuitem" href={{concat (env 'CONSUL_DOCS_URL') (get link item.Kind)}} rel="noopener noreferrer" target="_blank">
+                    Documentation
+                  </a>
+                </li>
+                <li role="separator">
+                  Other gateway types
+                </li>
+              {{#if (not-eq item.Kind 'mesh-gateway')}}
+                <li role="none" class="docs-link">
+                  <a tabindex="-1" role="menuitem" href={{concat (env 'CONSUL_DOCS_URL') (get link 'mesh-gateway')}} rel="noopener noreferrer" target="_blank">
+                    Mesh gateways
+                  </a>
+                </li>
+              {{/if}}
+              {{#if (not-eq item.Kind 'terminating-gateway')}}
+                <li role="none" class="docs-link">
+                  <a tabindex="-1" role="menuitem" href={{concat (env 'CONSUL_DOCS_URL') (get link 'terminating-gateway')}} rel="noopener noreferrer" target="_blank">
+                    Terminating gateways
+                  </a>
+                </li>
+              {{/if}}
+              {{#if (not-eq item.Kind 'ingress-gateway')}}
+                <li role="none" class="docs-link">
+                  <a tabindex="-1" role="menuitem" href={{concat (env 'CONSUL_DOCS_URL') (get link 'ingress-gateway')}} rel="noopener noreferrer" target="_blank">
+                    Ingress gateways
+                  </a>
+                </li>
+              {{/if}}
+          {{/let}}
+              </BlockSlot>
+            </MenuPanel>
+          </dd>
+        </dl>
+      {{else}}
+          <span data-test-kind={{item.Kind}} class="consul-kind gateway">
+              <span>{{Name}}</span>
+          </span>
+      {{/if}}
+    {{/if}}
+  {{/let}}
 {{/if}}
diff --git a/ui-v2/app/components/hashicorp-consul/index.hbs b/ui-v2/app/components/hashicorp-consul/index.hbs
index 8854661586..a41d1c15d1 100644
--- a/ui-v2/app/components/hashicorp-consul/index.hbs
+++ b/ui-v2/app/components/hashicorp-consul/index.hbs
@@ -13,7 +13,7 @@
 {{#if dc}}
                 <ul>
   {{#if (and (env 'CONSUL_NSPACES_ENABLED') (gt nspaces.length 0))}}
-                    <li data-test-nspace-menu>
+                    <li class="nspaces" data-test-nspace-menu>
     {{#if (and (eq nspaces.length 1) (not canManageNspaces)) }}
                         <span data-test-nspace-selected={{nspace.Name}}>{{nspace.Name}}</span>
     {{ else }}
diff --git a/ui-v2/app/components/menu-panel/index.hbs b/ui-v2/app/components/menu-panel/index.hbs
new file mode 100644
index 0000000000..c0188e052d
--- /dev/null
+++ b/ui-v2/app/components/menu-panel/index.hbs
@@ -0,0 +1,15 @@
+{{yield}}
+<div class="menu-panel {{position}}">
+  <YieldSlot @name="controls">
+    {{yield}}
+  </YieldSlot>
+  {{#yield-slot name="header"}}
+    <div>{{yield}}</div>
+  {{else}}
+  {{/yield-slot}}
+  <ul role="menu" ...attributes>
+    <YieldSlot @name="menu">
+      {{yield}}
+    </YieldSlot>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/ui-v2/app/components/menu-panel/index.js b/ui-v2/app/components/menu-panel/index.js
new file mode 100644
index 0000000000..3d0b05e3bf
--- /dev/null
+++ b/ui-v2/app/components/menu-panel/index.js
@@ -0,0 +1,7 @@
+import Component from '@ember/component';
+
+import Slotted from 'block-slots';
+
+export default Component.extend(Slotted, {
+  tagName: '',
+});
diff --git a/ui-v2/app/components/popover-menu/index.hbs b/ui-v2/app/components/popover-menu/index.hbs
index 3552845d00..c1442e8564 100644
--- a/ui-v2/app/components/popover-menu/index.hbs
+++ b/ui-v2/app/components/popover-menu/index.hbs
@@ -11,21 +11,22 @@
       </YieldSlot>
     </button>
   </ToggleButton>
-  <div class={{position}}>
-    <input type="checkbox" id={{concat 'popover-menu-' guid '-'}} />
-    {{#each submenus as |sub|}}
-      <input type="checkbox" id={{concat 'popover-menu-' guid '-' sub}} />
-    {{/each}}
-    {{#yield-slot name='header'}}
-      <div>
-        {{yield}}
-      </div>
-    {{else}}
-    {{/yield-slot}}
-    <ul role="menu" id={{ariaControls}} aria-labelledby={{ariaLabelledBy}} aria-expanded={{ariaExpanded}}>
+  <MenuPanel @position={{position}} id={{ariaControls}} aria-labelledby={{ariaLabelledBy}} aria-expanded={{ariaExpanded}}>
+    <BlockSlot @name="controls">
+      <input type="checkbox" id={{concat 'popover-menu-' guid '-'}} />
+      {{#each submenus as |sub|}}
+        <input type="checkbox" id={{concat 'popover-menu-' guid '-' sub}} />
+      {{/each}}
+    </BlockSlot>
+    {{#if hasHeader}}
+      <BlockSlot @name="header">
+        {{#yield-slot name="header"}}{{yield}}{{else}}{{/yield-slot}}
+      </BlockSlot>
+    {{/if}}
+    <BlockSlot @name="menu">
       <YieldSlot @name="menu" @params={{block-params (concat "popover-menu-" guid "-") send keypressClick this.toggle.click}}>
         {{yield}}
       </YieldSlot>
-    </ul>
-  </div>
+    </BlockSlot>
+  </MenuPanel>
 </AriaMenu>
\ No newline at end of file
diff --git a/ui-v2/app/components/popover-menu/index.js b/ui-v2/app/components/popover-menu/index.js
index 3079f9eb30..9f68520ed0 100644
--- a/ui-v2/app/components/popover-menu/index.js
+++ b/ui-v2/app/components/popover-menu/index.js
@@ -2,6 +2,7 @@
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import Slotted from 'block-slots';
+import { set } from '@ember/object';
 
 export default Component.extend(Slotted, {
   tagName: '',
@@ -16,6 +17,9 @@ export default Component.extend(Slotted, {
     this._super(...arguments);
     this.guid = this.dom.guid(this);
   },
+  willRender: function() {
+    set(this, 'hasHeader', this._isRegistered('header'));
+  },
   actions: {
     change: function(e) {
       if (!e.target.checked) {
diff --git a/ui-v2/app/helpers/from-entries.js b/ui-v2/app/helpers/from-entries.js
new file mode 100644
index 0000000000..baa892d998
--- /dev/null
+++ b/ui-v2/app/helpers/from-entries.js
@@ -0,0 +1,5 @@
+import { helper } from '@ember/component/helper';
+
+export default helper(function fromEntries(params /*, hash*/) {
+  return Object.fromEntries(params);
+});
diff --git a/ui-v2/app/styles/base/components/buttons/skin.scss b/ui-v2/app/styles/base/components/buttons/skin.scss
index 64f3b5eb76..d0c95fc07a 100644
--- a/ui-v2/app/styles/base/components/buttons/skin.scss
+++ b/ui-v2/app/styles/base/components/buttons/skin.scss
@@ -4,6 +4,7 @@
   @extend %user-select-none;
   cursor: pointer;
   white-space: nowrap;
+  text-decoration: none;
 }
 %button:disabled,
 %internal-button:disabled {
diff --git a/ui-v2/app/styles/base/components/menu-panel/layout.scss b/ui-v2/app/styles/base/components/menu-panel/layout.scss
index a1d6385279..7614f3aeb0 100644
--- a/ui-v2/app/styles/base/components/menu-panel/layout.scss
+++ b/ui-v2/app/styles/base/components/menu-panel/layout.scss
@@ -1,6 +1,5 @@
 %menu-panel {
   position: absolute;
-  overflow: hidden;
 }
 %menu-panel [type='checkbox'] {
   display: none;
@@ -15,8 +14,14 @@
   /* or be hardcoded */
   /* min-height: 143px; */
 }
-%menu-panel [role='menuitem']::after {
-  float: right;
+%menu-panel [role='menuitem'] {
+  display: flex;
+  justify-content: space-between;
+}
+%menu-panel [role='menuitem']:after {
+  @extend %as-pseudo;
+  display: block !important;
+  background-position: center right !important;
 }
 %menu-panel-sub-panel {
   position: absolute;
@@ -70,7 +75,7 @@
 }
 %menu-panel-header {
   padding: 10px;
-  padding-left: 36px;
+  white-space: normal;
 }
 /* here the !important is only needed for what seems to be a difference */
 /* with the CSS before and after compression */
diff --git a/ui-v2/app/styles/base/components/menu-panel/skin.scss b/ui-v2/app/styles/base/components/menu-panel/skin.scss
index 49483fee19..784df4f446 100644
--- a/ui-v2/app/styles/base/components/menu-panel/skin.scss
+++ b/ui-v2/app/styles/base/components/menu-panel/skin.scss
@@ -22,12 +22,12 @@
   border-top: $decor-border-100;
   border-color: $gray-300;
 }
-%menu-panel-header {
-  background-color: $gray-050;
+
+%menu-panel .docs-link a::after {
+  @extend %with-docs-mask, %as-pseudo;
 }
-%menu-panel-header::before {
-  @extend %with-info-circle-fill-color-icon, %as-pseudo;
-  font-size: 1.1em;
+%menu-panel .learn-link a::after {
+  @extend %with-learn-mask, %as-pseudo;
 }
 %menu-panel .is-active > *::after {
   @extend %with-check-plain-mask, %as-pseudo;
diff --git a/ui-v2/app/styles/base/components/pill/layout.scss b/ui-v2/app/styles/base/components/pill/layout.scss
index 74b6c07aa2..f78238ed15 100644
--- a/ui-v2/app/styles/base/components/pill/layout.scss
+++ b/ui-v2/app/styles/base/components/pill/layout.scss
@@ -16,6 +16,7 @@
   padding: 0 8px;
   border-radius: $decor-radius-100;
   height: 18px;
+  display: inline-block;
   line-height: 0.7rem;
 }
 %reduced-pill > span {
diff --git a/ui-v2/app/styles/base/components/popover-menu/index.scss b/ui-v2/app/styles/base/components/popover-menu/index.scss
index 239df86085..f8731956bc 100644
--- a/ui-v2/app/styles/base/components/popover-menu/index.scss
+++ b/ui-v2/app/styles/base/components/popover-menu/index.scss
@@ -12,6 +12,7 @@
 %popover-menu + label > * {
   @extend %toggle-button;
 }
+%more-popover-menu-panel,
 %popover-menu-panel {
   @extend %menu-panel;
 }
diff --git a/ui-v2/app/styles/base/components/popover-menu/layout.scss b/ui-v2/app/styles/base/components/popover-menu/layout.scss
index 6de7f20273..eed7f3cca1 100644
--- a/ui-v2/app/styles/base/components/popover-menu/layout.scss
+++ b/ui-v2/app/styles/base/components/popover-menu/layout.scss
@@ -11,7 +11,7 @@
   @extend %toggle-button;
 }
 %more-popover-menu-panel {
-  @extend %menu-panel;
+  overflow: hidden;
   width: 192px;
 }
 %more-popover-menu + label + div {
diff --git a/ui-v2/app/styles/components/app-view/layout.scss b/ui-v2/app/styles/components/app-view/layout.scss
index c94516038c..683ec21b13 100644
--- a/ui-v2/app/styles/components/app-view/layout.scss
+++ b/ui-v2/app/styles/components/app-view/layout.scss
@@ -6,6 +6,8 @@
   display: flex;
   align-items: center;
   white-space: nowrap;
+  position: relative;
+  z-index: 1;
 }
 %app-view-actions {
   margin-left: auto;
diff --git a/ui-v2/app/styles/components/index.scss b/ui-v2/app/styles/components/index.scss
index 058c04a4c4..305a954c92 100644
--- a/ui-v2/app/styles/components/index.scss
+++ b/ui-v2/app/styles/components/index.scss
@@ -33,6 +33,8 @@
 @import './list-collection';
 @import './grid-collection';
 @import './popover-select';
+@import './tooltip-panel';
+@import './menu-panel';
 
 /**/
 
diff --git a/ui-v2/app/styles/components/main-header-horizontal.scss b/ui-v2/app/styles/components/main-header-horizontal.scss
index ce3289ca14..315ebd5a7d 100644
--- a/ui-v2/app/styles/components/main-header-horizontal.scss
+++ b/ui-v2/app/styles/components/main-header-horizontal.scss
@@ -9,7 +9,7 @@
   @extend %with-docs-icon, %as-pseudo;
 }
 %main-nav-horizontal .feedback-link a::after {
-  @extend %with-logo-github-monochrome-icon, %as-pseudo;
+  @extend %with-logo-github-monochrome-mask, %as-pseudo;
 }
 %main-header-horizontal::before {
   background-color: var(--swatch-brand-600, $black);
diff --git a/ui-v2/app/styles/components/main-nav-horizontal.scss b/ui-v2/app/styles/components/main-nav-horizontal.scss
index ef8e69e3e1..71d52c083d 100644
--- a/ui-v2/app/styles/components/main-nav-horizontal.scss
+++ b/ui-v2/app/styles/components/main-nav-horizontal.scss
@@ -10,6 +10,15 @@
 %secondary-nav {
   @extend %main-nav-horizontal;
 }
+%primary-nav .nspaces .menu-panel > div {
+  background-color: $gray-050;
+  padding-left: 36px;
+}
+%primary-nav .nspaces .menu-panel > div::before {
+  @extend %with-info-circle-fill-mask, %as-pseudo;
+  color: $blue-500;
+  font-size: 1.1em;
+}
 
 %main-header-horizontal > div {
   @extend %main-nav-horizontal-panel;
diff --git a/ui-v2/app/styles/components/menu-panel.scss b/ui-v2/app/styles/components/menu-panel.scss
new file mode 100644
index 0000000000..09ee8e24e3
--- /dev/null
+++ b/ui-v2/app/styles/components/menu-panel.scss
@@ -0,0 +1,3 @@
+.menu-panel {
+  @extend %menu-panel;
+}
diff --git a/ui-v2/app/styles/components/tooltip-panel.scss b/ui-v2/app/styles/components/tooltip-panel.scss
new file mode 100644
index 0000000000..adc58e4606
--- /dev/null
+++ b/ui-v2/app/styles/components/tooltip-panel.scss
@@ -0,0 +1,4 @@
+@import './tooltip-panel/index';
+.tooltip-panel {
+  @extend %tooltip-panel;
+}
diff --git a/ui-v2/app/styles/components/tooltip-panel/index.scss b/ui-v2/app/styles/components/tooltip-panel/index.scss
new file mode 100644
index 0000000000..bc18252196
--- /dev/null
+++ b/ui-v2/app/styles/components/tooltip-panel/index.scss
@@ -0,0 +1,2 @@
+@import './skin';
+@import './layout';
diff --git a/ui-v2/app/styles/components/tooltip-panel/layout.scss b/ui-v2/app/styles/components/tooltip-panel/layout.scss
new file mode 100644
index 0000000000..d4f6917db0
--- /dev/null
+++ b/ui-v2/app/styles/components/tooltip-panel/layout.scss
@@ -0,0 +1,21 @@
+%tooltip-panel {
+  margin: 0 !important;
+}
+%tooltip-panel dd > div {
+  top: auto !important;
+}
+%tooltip-panel dt {
+  cursor: pointer;
+}
+%tooltip-panel dd {
+  display: none;
+  position: relative;
+  padding-top: 10px;
+  margin-bottom: -10px;
+}
+%tooltip-panel:hover dd {
+  display: block;
+}
+%tooltip-panel dd > div {
+  width: 250px;
+}
diff --git a/ui-v2/app/styles/components/tooltip-panel/skin.scss b/ui-v2/app/styles/components/tooltip-panel/skin.scss
new file mode 100644
index 0000000000..746fb7f5d7
--- /dev/null
+++ b/ui-v2/app/styles/components/tooltip-panel/skin.scss
@@ -0,0 +1,13 @@
+/* This is the top chevron */
+%tooltip-panel dd > div::before {
+  @extend %as-pseudo;
+  width: 12px;
+  height: 12px;
+  background: white;
+  border-top: 1px solid $gray-300;
+  border-right: 1px solid $gray-300;
+  transform: rotate(-45deg);
+  position: absolute;
+  left: 16px;
+  top: -7px;
+}
diff --git a/ui-v2/app/templates/dc/services/instance.hbs b/ui-v2/app/templates/dc/services/instance.hbs
index 1279a2350c..a9ab9bb0b0 100644
--- a/ui-v2/app/templates/dc/services/instance.hbs
+++ b/ui-v2/app/templates/dc/services/instance.hbs
@@ -14,7 +14,7 @@
         {{ item.ID }}
       </h1>
       <ConsulExternalSource @item={{item}} />
-      <ConsulKind @item={{item}} />
+      <ConsulKind @item={{item}} @withInfo={{true}} />
     </BlockSlot>
     <BlockSlot @name="nav">
       <dl>
diff --git a/ui-v2/app/templates/dc/services/show.hbs b/ui-v2/app/templates/dc/services/show.hbs
index eaa5b44cfa..15d8da6776 100644
--- a/ui-v2/app/templates/dc/services/show.hbs
+++ b/ui-v2/app/templates/dc/services/show.hbs
@@ -14,7 +14,7 @@
         {{item.Service.Service}}
       </h1>
       <ConsulExternalSource @item={{item.Service}} />
-      <ConsulKind @item={{item.Service}} />
+      <ConsulKind @item={{item.Service}} @withInfo={{true}} />
   </BlockSlot>
   <BlockSlot @name="nav">
   {{#if (not-eq item.Service.Kind 'mesh-gateway')}}
@@ -22,19 +22,19 @@
       compact
           (array
                 (hash label="Instances" href=(href-to "dc.services.show.instances") selected=(is-href "dc.services.show.instances"))
-(if (eq item.Service.Kind 'terminating-gateway') 
+(if (eq item.Service.Kind 'terminating-gateway')
                 (hash label="Linked Services" href=(href-to "dc.services.show.services") selected=(is-href "dc.services.show.services"))
 '')
-(if (eq item.Service.Kind 'ingress-gateway') 
+(if (eq item.Service.Kind 'ingress-gateway')
                 (hash label="Upstreams" href=(href-to "dc.services.show.upstreams") selected=(is-href "dc.services.show.upstreams"))
 '')
-(if (not item.Service.Kind) 
+(if (not item.Service.Kind)
                 (hash label="Intentions" href=(href-to "dc.services.show.intentions") selected=(is-href "dc.services.show.intentions"))
 '')
-(if chain 
+(if chain
                 (hash label="Routing" href=(href-to "dc.services.show.routing") selected=(is-href "dc.services.show.routing"))
 '')
-(if (not item.Service.Kind) 
+(if (not item.Service.Kind)
                 (hash label="Tags" href=(href-to "dc.services.show.tags") selected=(is-href "dc.services.show.tags"))
 '')
           )