diff --git a/ui/core/.template-lintrc.js b/ui/core/.template-lintrc.js
index 61df6a727..4db5af2b0 100644
--- a/ui/core/.template-lintrc.js
+++ b/ui/core/.template-lintrc.js
@@ -4,7 +4,7 @@ module.exports = {
   extends: 'octane',
   rules: {
     'no-bare-strings': true,
-    'no-curly-component-invocation': { allow: ['app-name'] },
-    'no-implicit-this': { allow: ['app-name'] }
+    'no-curly-component-invocation': { allow: ['app-name', 'company-name', 'company-copyright'] },
+    'no-implicit-this': { allow: ['app-name', 'company-name', 'company-copyright', 'doc-url'] }
   }
 };
diff --git a/ui/core/app/helpers/company-copyright.js b/ui/core/app/helpers/company-copyright.js
new file mode 100644
index 000000000..f4e799954
--- /dev/null
+++ b/ui/core/app/helpers/company-copyright.js
@@ -0,0 +1,7 @@
+import { helper } from '@ember/component/helper';
+import config from '../config/environment';
+
+export default helper(function companyCopyright() {
+  const currentYear = new Date().getFullYear();
+  return `© ${currentYear} ${config.companyName}`;
+});
diff --git a/ui/core/app/helpers/company-name.js b/ui/core/app/helpers/company-name.js
new file mode 100644
index 000000000..78d99f2e7
--- /dev/null
+++ b/ui/core/app/helpers/company-name.js
@@ -0,0 +1,6 @@
+import { helper } from '@ember/component/helper';
+import config from '../config/environment';
+
+export default helper(function companyName() {
+  return config.companyName;
+});
diff --git a/ui/core/app/helpers/doc-url.js b/ui/core/app/helpers/doc-url.js
index ae10962ce..e31e4932a 100644
--- a/ui/core/app/helpers/doc-url.js
+++ b/ui/core/app/helpers/doc-url.js
@@ -5,7 +5,7 @@ import config from '../config/environment';
 
 export default helper(function docUrl(params/*, hash*/) {
   const baseURL = config.documentation.baseURL;
-  const docKey = params[0];
+  const docKey = params[0] || '';
   const configuredPath = get(config.documentation, docKey);
   if (docKey) {
     assert(`
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.js
index 91a502f82..4d88c52b1 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.js
@@ -23,7 +23,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHo
     super.renderTemplate(...arguments);
 
     this.render(
-      'scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header',
+      'scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header',
       {
         into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
         outlet: 'header',
@@ -32,7 +32,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHo
     );
 
     this.render(
-      'scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation',
+      'scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-navigation',
       {
         into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
         outlet: 'navigation',
@@ -41,7 +41,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHo
     );
 
     this.render(
-      'scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions',
+      'scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-actions',
       {
         into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
         outlet: 'actions',
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js
index 1cfa23223..da1ca0685 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js
@@ -23,7 +23,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsHostR
     super.renderTemplate(...arguments);
 
     this.render(
-      'scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header',
+      'scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header',
       {
         into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
         outlet: 'header',
@@ -32,7 +32,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsHostR
     );
 
     this.render(
-      'scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-navigation',
+      'scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-navigation',
       {
         into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
         outlet: 'navigation',
@@ -41,7 +41,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsHostR
     );
 
     this.render(
-      'scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-actions',
+      'scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-actions',
       {
         into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
         outlet: 'actions',
diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs
index fa96053b4..ac4f0eac3 100644
--- a/ui/core/app/templates/application.hbs
+++ b/ui/core/app/templates/application.hbs
@@ -59,11 +59,13 @@
 
   <layout.footer>
     <Rose::Footer as |footer|>
-      <footer.brand @logo="logo-hashi" @text={{t "hashicorp.title"}} />
-      <footer.text>{{t "hashicorp.copyright"}}</footer.text>
-      <footer.text>{{t "hashicorp.product"}}</footer.text>
+      <footer.brand @logo="logo-hashi" @text={{company-name}} />
+      <footer.text>{{company-copyright}}</footer.text>
+      <footer.text>{{app-name}}</footer.text>
       <footer.nav as |nav|>
-        <nav.link @href={{t "hashicorp.documentation.link"}}>{{t "hashicorp.documentation.title"}}</nav.link>
+        <nav.link @href={{doc-url}}>
+          {{t "titles.documentation"}}
+        </nav.link>
       </footer.nav>
     </Rose::Footer>
   </layout.footer>
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
index bd1bc825e..98ab86788 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.auth-method.title"}}</h2>
+<h2>
+  {{t "resources.auth-method.title"}}
+  <DocLink @doc="topics.auth-method" @iconSize="large" />
+</h2>
 <p>{{t "resources.auth-method.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
index d67dca8b1..7dd6fd4cb 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.account.title"}}</h2>
+<h2>
+  {{t "resources.account.title"}}
+  <DocLink @doc="topics.account" @iconSize="large" />
+</h2>
 <Copyable
   @text={{@model.id}}
   @buttonText={{t "actions.copy-to-clipboard"}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
index 97d481a65..5d3f270d2 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -1,6 +1,9 @@
 <Rose::Layout::Page as |page|>
   <page.header>
-    <h2>{{t "resources.auth-method.title_plural"}}</h2>
+    <h2>
+      {{t "resources.auth-method.title_plural"}}
+      <DocLink @doc="topics.auth-method" @iconSize="large" />
+    </h2>
     <p>{{t "resources.auth-method.description"}}</p>
   </page.header>
 
diff --git a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
index ae241529b..ad843f83a 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.group.title"}}</h2>
+<h2>
+  {{t "resources.group.title"}}
+  <DocLink @doc="topics.group" @iconSize="large" />
+</h2>
 <p>{{t "resources.group.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/groups/index.hbs b/ui/core/app/templates/scopes/scope/groups/index.hbs
index c955a1282..197782427 100644
--- a/ui/core/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.group.title_plural"}}</h2>
+    <h2>
+      {{t "resources.group.title_plural"}}
+      <DocLink @doc="topics.group" @iconSize="large" />
+    </h2>
     <p>{{t "resources.group.description"}}</p>
   </page.header>
 
diff --git a/ui/core/app/templates/scopes/scope/orgs/index.hbs b/ui/core/app/templates/scopes/scope/orgs/index.hbs
index 30c211450..efe5f0a59 100644
--- a/ui/core/app/templates/scopes/scope/orgs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/orgs/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.org.title_plural"}}</h2>
+    <h2>
+      {{t "resources.org.title_plural"}}
+      <DocLink @doc="topics.org" @iconSize="large" />
+    </h2>
     {{#if @model}}
       <p>{{t "resources.org.description"}}</p>
     {{/if}}
diff --git a/ui/core/app/templates/scopes/scope/projects/index.hbs b/ui/core/app/templates/scopes/scope/projects/index.hbs
index 6173aeffb..fca7f0fae 100644
--- a/ui/core/app/templates/scopes/scope/projects/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.project.title_plural"}}</h2>
+    <h2>
+      {{t "resources.project.title_plural"}}
+      <DocLink @doc="topics.project" @iconSize="large" />
+    </h2>
     {{#if @model}}
       <p>{{t "resources.project.description"}}</p>
     {{/if}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
index 647741ad9..f4d885fae 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.host-catalog.title"}}</h2>
+<h2>
+  {{t "resources.host-catalog.title"}}
+  <DocLink @doc="topics.host-catalog" @iconSize="large" />
+</h2>
 <p>{{t "resources.host-catalog.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs
similarity index 100%
rename from ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs
rename to ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
similarity index 67%
rename from ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
rename to ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
index 3c76eafd3..1d63aa7e0 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.host-set.title"}}</h2>
+<h2>
+  {{t "resources.host-set.title"}}
+  <DocLink @doc="topics.host-set" @iconSize="large" />
+</h2>
 <p>{{t "resources.host-set.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-navigation.hbs
similarity index 100%
rename from ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs
rename to ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-navigation.hbs
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-actions.hbs
similarity index 100%
rename from ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-actions.hbs
rename to ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-actions.hbs
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
similarity index 68%
rename from ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
rename to ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
index d2628a102..3c28edc80 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.host.title"}}</h2>
+<h2>
+  {{t "resources.host.title"}}
+  <DocLink @doc="topics.host" @iconSize="large" />
+</h2>
 <p>{{t "resources.host.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-navigation.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-navigation.hbs
similarity index 100%
rename from ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-navigation.hbs
rename to ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-navigation.hbs
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
index 0a70b3ee4..120ae0e48 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.host-catalog.title_plural"}}</h2>
+    <h2>
+      {{t "resources.host-catalog.title_plural"}}
+      <DocLink @doc="topics.host-catalog" @iconSize="large" />
+    </h2>
     <p>{{t "resources.host-catalog.description"}}</p>
   </page.header>
 
diff --git a/ui/core/app/templates/scopes/scope/projects/project/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
index 0de5bb65c..4cb31e30a 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.project.title"}}</h2>
+    <h2>
+      {{t "resources.project.title"}}
+      <DocLink @doc="topics.project" @iconSize="large" />
+    </h2>
     <p>{{t "resources.project.description"}}</p>
     <Copyable
       @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
index 1d69ecf7b..7ebdf1ece 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.session.title_plural"}}</h2>
+    <h2>
+      {{t "resources.session.title_plural"}}
+      <DocLink @doc="topics.session" @iconSize="large" />
+    </h2>
     <p>{{t "resources.session.description"}}</p>
   </page.header>
 
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
index 2cb938f29..9615a7c2d 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.target.title_plural"}}</h2>
+    <h2>
+      {{t "resources.target.title_plural"}}
+      <DocLink @doc="topics.target" @iconSize="large" />
+    </h2>
     {{#if @model}}
       <p>{{t "resources.target.description"}}</p>
     {{/if}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
index b6f507ea4..b94a925a8 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.target.title"}}</h2>
+<h2>
+  {{t "resources.target.title"}}
+  <DocLink @doc="topics.target" @iconSize="large" />
+</h2>
 <p>{{t "resources.target.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs
index 77c5d7d6a..2175ad1a9 100644
--- a/ui/core/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.role.title_plural"}}</h2>
+    <h2>
+      {{t "resources.role.title_plural"}}
+      <DocLink @doc="topics.role" @iconSize="large" />
+    </h2>
     {{#if @model}}
       <p>{{t "resources.role.description"}}</p>
     {{/if}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
index 03164c9b2..a04e5edc1 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.role.title"}}</h2>
+<h2>
+  {{t "resources.role.title"}}
+  <DocLink @doc="topics.role" @iconSize="large" />
+</h2>
 <p>{{t "resources.role.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
index 48e974188..84395fb77 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.role.title"}}</h2>
+<h2>
+  {{t "resources.role.title"}}
+  <DocLink @doc="topics.role" @iconSize="large" />
+</h2>
 <p>{{t "resources.role.grant.description"}}</p>
 <Copyable
   @text={{@model.id}}
@@ -6,4 +9,4 @@
   @acknowledgeText={{t "states.copied"}}
 >
   <code>{{@model.id}}</code>
-</Copyable>
\ No newline at end of file
+</Copyable>
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
index 499d7ff96..63c44f53c 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.role.title"}}</h2>
+<h2>
+  {{t "resources.role.title"}}
+  <DocLink @doc="topics.role" @iconSize="large" />
+</h2>
 <p>{{t "resources.role.principal.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index 6fa87743e..ad66923e5 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -5,7 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.user.title_plural"}}</h2>
+    <h2>
+      {{t "resources.user.title_plural"}}
+      <DocLink @doc="topics.user" @iconSize="large" />
+    </h2>
     {{#if @model}}
       <p>{{t "resources.user.description"}}</p>
     {{/if}}
diff --git a/ui/core/app/templates/scopes/scope/users/user/-header.hbs b/ui/core/app/templates/scopes/scope/users/user/-header.hbs
index d67b6c679..1f80dcfc5 100644
--- a/ui/core/app/templates/scopes/scope/users/user/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/-header.hbs
@@ -1,4 +1,7 @@
-<h2>{{t "resources.user.title"}}</h2>
+<h2>
+  {{t "resources.user.title"}}
+  <DocLink @doc="topics.user" @iconSize="large" />
+</h2>
 <p>{{t "resources.user.description"}}</p>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/config/environment.js b/ui/core/config/environment.js
index 93bb0495c..0eb7294af 100644
--- a/ui/core/config/environment.js
+++ b/ui/core/config/environment.js
@@ -32,6 +32,7 @@ module.exports = function (environment) {
     },
 
     appName: APP_NAME,
+    companyName: 'HashiCorp',
 
     notifyTimeout: 4000,
     sessionPollingTimeoutSeconds: 2.5,
diff --git a/ui/core/tests/integration/helpers/app-name-test.js b/ui/core/tests/integration/helpers/app-name-test.js
index 0dc7fbb09..cd86480cf 100644
--- a/ui/core/tests/integration/helpers/app-name-test.js
+++ b/ui/core/tests/integration/helpers/app-name-test.js
@@ -7,6 +7,7 @@ module('Integration | Helper | app-name', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function (assert) {
+    assert.expect(1);
     await render(hbs`{{app-name}}`);
     assert.equal(this.element.textContent.trim(), 'Boundary');
   });
diff --git a/ui/core/tests/integration/helpers/company-copyright-test.js b/ui/core/tests/integration/helpers/company-copyright-test.js
new file mode 100644
index 000000000..87b468e2f
--- /dev/null
+++ b/ui/core/tests/integration/helpers/company-copyright-test.js
@@ -0,0 +1,15 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Helper | company-copyright', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    assert.expect(1);
+    const currentYear = new Date().getFullYear();
+    await render(hbs`{{company-copyright}}`);
+    assert.equal(this.element.textContent.trim(), `© ${currentYear} HashiCorp`);
+  });
+});
diff --git a/ui/core/tests/integration/helpers/company-name-test.js b/ui/core/tests/integration/helpers/company-name-test.js
new file mode 100644
index 000000000..0599a936e
--- /dev/null
+++ b/ui/core/tests/integration/helpers/company-name-test.js
@@ -0,0 +1,14 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Helper | company-name', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    assert.expect(1);
+    await render(hbs`{{company-name}}`);
+    assert.equal(this.element.textContent.trim(), 'HashiCorp');
+  });
+});
diff --git a/ui/core/translations/actions/en-us.yaml b/ui/core/translations/actions/en-us.yaml
index 9b1fa9751..d2a680549 100644
--- a/ui/core/translations/actions/en-us.yaml
+++ b/ui/core/translations/actions/en-us.yaml
@@ -7,6 +7,7 @@ save: Save
 manage: Manage
 help: Need help?
 back: Back
+get-topic-help: Get help for this topic
 copy-to-clipboard: Copy to Clipboard
 authenticate: Authenticate
 deauthenticate: Deauthenticate
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 84b842579..4441f333c 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -16,15 +16,9 @@ titles:
   empty-set: No Items Yet
   global: Global
   actions: Actions
+  documentation: Documentation
 descriptions:
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
 questions:
   delete-confirm: Are you sure you want to delete this resource?
   remove-confirm: Are you sure you want to remove this association?
-hashicorp:
-  title: HashiCorp
-  copyright: © 2020 HashiCorp
-  product: Boundary v0.1
-  documentation:
-    title: Documentation
-    link: https://boundaryproject.io