diff --git a/addons/api/addon/.gitkeep b/addons/api/addon/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/addon/serializers/application.js b/addons/api/addon/serializers/application.js
index 2819231fa..e4531c7fe 100644
--- a/addons/api/addon/serializers/application.js
+++ b/addons/api/addon/serializers/application.js
@@ -37,8 +37,11 @@ export default class ApplicationSerializer extends RESTSerializer {
    * @param {String} key
    * @param {Object} attribute
    */
-  serializeAttribute(snapshot, json, key, { options }) {
+  serializeAttribute(snapshot, json, key, attribute) {
+    const { type, options } = attribute;
     let value = super.serializeAttribute(...arguments);
+    // Convert empty strings to null.
+    if (type === 'string' && json[key] === '') json[key] = null;
     // Do not serialize read-only attributes.
     if (options.readOnly) delete json[key];
     // Version is sent only if it has a non-nullish value
diff --git a/addons/api/app/.gitkeep b/addons/api/app/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/dummy/app/components/.gitkeep b/addons/api/tests/dummy/app/components/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/dummy/app/controllers/.gitkeep b/addons/api/tests/dummy/app/controllers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/dummy/app/helpers/.gitkeep b/addons/api/tests/dummy/app/helpers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/dummy/app/models/.gitkeep b/addons/api/tests/dummy/app/models/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/dummy/app/routes/.gitkeep b/addons/api/tests/dummy/app/routes/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/helpers/.gitkeep b/addons/api/tests/helpers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/integration/.gitkeep b/addons/api/tests/integration/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/api/tests/unit/serializers/application-test.js b/addons/api/tests/unit/serializers/application-test.js
index 10de9d4fb..014d80377 100644
--- a/addons/api/tests/unit/serializers/application-test.js
+++ b/addons/api/tests/unit/serializers/application-test.js
@@ -70,6 +70,21 @@ module('Unit | Serializer | application', function (hooks) {
     });
   });
 
+  test('it serializes empty strings to null', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('user', {
+      name: '',
+      description: '',
+      version: null,
+    });
+    let serializedRecord = record.serialize();
+    assert.deepEqual(serializedRecord, {
+      name: null,
+      description: null,
+    });
+  });
+
   test('it serializes non-nullish version fields', function (assert) {
     assert.expect(2);
     const store = this.owner.lookup('service:store');
diff --git a/addons/api/vendor/.gitkeep b/addons/api/vendor/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/app/.gitkeep b/addons/auth/app/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/dummy/app/components/.gitkeep b/addons/auth/tests/dummy/app/components/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/dummy/app/controllers/.gitkeep b/addons/auth/tests/dummy/app/controllers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/dummy/app/helpers/.gitkeep b/addons/auth/tests/dummy/app/helpers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/dummy/app/models/.gitkeep b/addons/auth/tests/dummy/app/models/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/dummy/app/routes/.gitkeep b/addons/auth/tests/dummy/app/routes/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/helpers/.gitkeep b/addons/auth/tests/helpers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/integration/.gitkeep b/addons/auth/tests/integration/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/auth/tests/unit/.gitkeep b/addons/auth/tests/unit/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/addon/.gitkeep b/addons/rose/addon/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/app/.gitkeep b/addons/rose/app/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/tests/dummy/app/components/.gitkeep b/addons/rose/tests/dummy/app/components/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/tests/dummy/app/helpers/.gitkeep b/addons/rose/tests/dummy/app/helpers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/tests/dummy/app/models/.gitkeep b/addons/rose/tests/dummy/app/models/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/tests/dummy/app/routes/.gitkeep b/addons/rose/tests/dummy/app/routes/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/tests/helpers/.gitkeep b/addons/rose/tests/helpers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/tests/integration/.gitkeep b/addons/rose/tests/integration/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/addons/rose/vendor/.gitkeep b/addons/rose/vendor/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/core/app/components/form/account/password/change-password/index.hbs b/ui/core/app/components/form/account/password/change-password/index.hbs
index 24548e843..954da26c1 100644
--- a/ui/core/app/components/form/account/password/change-password/index.hbs
+++ b/ui/core/app/components/form/account/password/change-password/index.hbs
@@ -1,6 +1,6 @@
 <Rose::Form
   class="full-width"
-  @onSubmit={{fn this.submit @submit}}
+  @onSubmit={{fn this.submit @submit this.currentPassword this.newPassword}}
   @cancel={{fn this.cancel @cancel}}
   @disabled={{@model.isSaving}}
   @error={{@model.errors.base}}
diff --git a/ui/core/app/components/form/account/password/change-password/index.js b/ui/core/app/components/form/account/password/change-password/index.js
index 0375feaea..e2dcd0bac 100644
--- a/ui/core/app/components/form/account/password/change-password/index.js
+++ b/ui/core/app/components/form/account/password/change-password/index.js
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { computed } from '@ember/object';
 import { action } from '@ember/object';
-import { next } from '@ember/runloop';
+import { run } from '@ember/runloop';
 
 export default class FormAccountPasswordChangePasswordIndexComponent extends Component {
 
@@ -50,13 +50,13 @@ export default class FormAccountPasswordChangePasswordIndexComponent extends Com
    * Call passed submit function with passwords.
    * Unset passwords before callack.
    * @param {function} fn
+   * @param {string} currentPassword
+   * @param {string} newPassword
    */
   @action
-  submit(fn) {
-    const currentPassword = this.currentPassword;
-    const newPassword = this.newPassword;
-    next(() => this.resetPasswords());
-    fn(currentPassword, newPassword);
+  submit(fn, currentPassword, newPassword) {
+    run(() => this.resetPasswords());
+    run(() => fn(currentPassword, newPassword));
   }
 
   /**
diff --git a/ui/core/app/components/form/account/password/set-password/index.hbs b/ui/core/app/components/form/account/password/set-password/index.hbs
index b77d6b659..9008a9094 100644
--- a/ui/core/app/components/form/account/password/set-password/index.hbs
+++ b/ui/core/app/components/form/account/password/set-password/index.hbs
@@ -1,5 +1,5 @@
 <Rose::Form
-  @onSubmit={{fn this.submit @submit}}
+  @onSubmit={{fn this.submit @submit this.password}}
   @disabled={{@model.isSaving}}
   @error={{@model.errors.base}}
   as |form|
diff --git a/ui/core/app/components/form/account/password/set-password/index.js b/ui/core/app/components/form/account/password/set-password/index.js
index 2548bca49..62df4d78c 100644
--- a/ui/core/app/components/form/account/password/set-password/index.js
+++ b/ui/core/app/components/form/account/password/set-password/index.js
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { computed } from '@ember/object';
 import { action } from '@ember/object';
-import { next } from '@ember/runloop';
+import { run } from '@ember/runloop';
 
 export default class FormAccountPasswordSetPasswordIndexComponent extends Component {
   // =properties
@@ -36,11 +36,11 @@ export default class FormAccountPasswordSetPasswordIndexComponent extends Compon
    * Submit with password value when it is allowed.
    * Callback with no arguments otherwise.
    * @param {function} fn
+   * @param {string} password
    */
   @action
-  submit(fn) {
-    const password = this.password;
-    next(() => this.resetPassword());
-    fn(password);
+  submit(fn, password) {
+    run(() => this.resetPassword());
+    run(() => fn(password));
   }
 }
diff --git a/ui/core/app/helpers/doc-url.js b/ui/core/app/helpers/doc-url.js
index e31e4932a..bff751918 100644
--- a/ui/core/app/helpers/doc-url.js
+++ b/ui/core/app/helpers/doc-url.js
@@ -1,12 +1,11 @@
 import { helper } from '@ember/component/helper';
-import { get } from '@ember/object';
 import { assert } from '@ember/debug';
 import config from '../config/environment';
 
 export default helper(function docUrl(params/*, hash*/) {
   const baseURL = config.documentation.baseURL;
   const docKey = params[0] || '';
-  const configuredPath = get(config.documentation, docKey);
+  const configuredPath = config.documentation.topics[docKey];
   if (docKey) {
     assert(`
       Documentation for "${docKey}" could not be found. Please ensure that
diff --git a/ui/core/app/index.html b/ui/core/app/index.html
index 21cb16f81..248478b1f 100644
--- a/ui/core/app/index.html
+++ b/ui/core/app/index.html
@@ -12,6 +12,8 @@
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/core.css">
 
+    <link rel="icon" type="image/svg+xml" href="{{rootURL}}logo-app.svg">
+
     {{content-for "head-footer"}}
   </head>
   <body>
diff --git a/ui/core/app/models/.gitkeep b/ui/core/app/models/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs
index 839efa563..8d4852ea5 100644
--- a/ui/core/app/templates/application.hbs
+++ b/ui/core/app/templates/application.hbs
@@ -5,13 +5,13 @@
 
   <layout.header>
     <Rose::Header class="{{if (is-loading) " loading"}}" as |header|>
-      <header.brand @logo="logo-boundary" @text={{app-name}} />
+      <header.brand @logo="logo-app" @text={{app-name}} />
 
       {{#if this.session.isAuthenticated}}
         <header.nav as |nav|>
           <nav.dropdown
             @text={{this.scope.displayName}}
-            @icon="boundary-icons/org" as |dropdown|
+            @icon="app-icons/org" as |dropdown|
           >
             {{#if this.session.data.authenticated.isGlobal}}
               <dropdown.link @route="scopes.scope" @model="global">
@@ -35,7 +35,7 @@
         <header.utilities as |utilities|>
           <utilities.dropdown
             @text={{this.session.data.authenticated.username}}
-            @icon="boundary-icons/user-profile" as |dropdown|
+            @icon="app-icons/user-profile" as |dropdown|
           >
             <dropdown.link @route="account.change-password">
               {{t 'actions.change-password'}}
@@ -60,7 +60,7 @@
 
   <layout.footer>
     <Rose::Footer as |footer|>
-      <footer.brand @logo="logo-hashi" @text={{company-name}} />
+      <footer.brand @logo="logo-company" @text={{company-name}} />
       <footer.text>{{company-copyright}}</footer.text>
       <footer.text>{{app-name}}</footer.text>
       <footer.nav as |nav|>
diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs
index 2d7d21026..908b13f16 100644
--- a/ui/core/app/templates/scopes/scope.hbs
+++ b/ui/core/app/templates/scopes/scope.hbs
@@ -6,7 +6,7 @@
       <Rose::Nav::Sidebar @title={{t "titles.general"}} as |nav|>
         <nav.link @route="scopes.scope.projects">
           <Rose::Icon
-            @name="boundary-icons/project"
+            @name="app-icons/project"
             @size="medium" />
           {{t "resources.project.title_plural"}}
         </nav.link>
diff --git a/ui/core/app/templates/scopes/scope/-sidebar.hbs b/ui/core/app/templates/scopes/scope/-sidebar.hbs
index 27852d3ec..45780e932 100644
--- a/ui/core/app/templates/scopes/scope/-sidebar.hbs
+++ b/ui/core/app/templates/scopes/scope/-sidebar.hbs
@@ -1,25 +1,25 @@
 <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
   <nav.link @route="scopes.scope.users">
     <Rose::Icon
-      @name="boundary-icons/users"
+      @name="app-icons/users"
       @size="medium" />
     {{t "resources.user.title_plural"}}
   </nav.link>
   <nav.link @route="scopes.scope.groups">
     <Rose::Icon
-      @name="boundary-icons/group"
+      @name="app-icons/group"
       @size="medium" />
     {{t "resources.group.title_plural"}}
   </nav.link>
   <nav.link @route="scopes.scope.roles">
     <Rose::Icon
-      @name="boundary-icons/roles"
+      @name="app-icons/roles"
       @size="medium" />
     {{t "resources.role.title_plural"}}
   </nav.link>
   <nav.link @route="scopes.scope.auth-methods">
     <Rose::Icon
-      @name="boundary-icons/auth-method"
+      @name="app-icons/auth-method"
       @size="medium" />
     {{t "resources.auth-method.title_plural"}}
   </nav.link>
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 98ab86788..080012f3b 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,6 +1,6 @@
 <h2>
   {{t "resources.auth-method.title"}}
-  <DocLink @doc="topics.auth-method" @iconSize="large" />
+  <DocLink @doc="auth-method" @iconSize="large" />
 </h2>
 <p>{{t "resources.auth-method.description"}}</p>
 <Copyable
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 7dd6fd4cb..c74f1844c 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,6 +1,6 @@
 <h2>
   {{t "resources.account.title"}}
-  <DocLink @doc="topics.account" @iconSize="large" />
+  <DocLink @doc="account" @iconSize="large" />
 </h2>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
index ace8ccb08..00086a2d0 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
@@ -1 +1,4 @@
-<h2>{{t "titles.new"}}</h2>
\ No newline at end of file
+<h2>
+  {{t "titles.new"}}
+  <DocLink @doc="account.new" @iconSize="large" />
+</h2>
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 5d3f270d2..a796c66f5 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -2,7 +2,7 @@
   <page.header>
     <h2>
       {{t "resources.auth-method.title_plural"}}
-      <DocLink @doc="topics.auth-method" @iconSize="large" />
+      <DocLink @doc="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 ad843f83a..6dab6766a 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.group.title"}}
-  <DocLink @doc="topics.group" @iconSize="large" />
+  <DocLink @doc="group" @iconSize="large" />
 </h2>
 <p>{{t "resources.group.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs
index 6d2cadabc..207f55d46 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.group.messages.add-members.title"}}</h2>
+<h2>
+  {{t "resources.group.messages.add-members.title"}}
+  <DocLink @doc="group.add-members" @iconSize="large" />
+</h2>
 <p>{{t "resources.group.messages.add-members.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/groups/index.hbs b/ui/core/app/templates/scopes/scope/groups/index.hbs
index 197782427..7dbf66358 100644
--- a/ui/core/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.group.title_plural"}}
-      <DocLink @doc="topics.group" @iconSize="large" />
+      <DocLink @doc="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 efe5f0a59..7218551bb 100644
--- a/ui/core/app/templates/scopes/scope/orgs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/orgs/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.org.title_plural"}}
-      <DocLink @doc="topics.org" @iconSize="large" />
+      <DocLink @doc="org" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.org.description"}}</p>
@@ -35,7 +35,7 @@
             @title={{org.name}}
             @description={{org.description}}
             @id={{org.id}}
-            @icon="boundary-icons/org"
+            @icon="app-icons/org"
             @route="scopes.scope"
             @model={{org.id}}
           />
diff --git a/ui/core/app/templates/scopes/scope/orgs/new.hbs b/ui/core/app/templates/scopes/scope/orgs/new.hbs
index d9fe8b361..390f0f04b 100644
--- a/ui/core/app/templates/scopes/scope/orgs/new.hbs
+++ b/ui/core/app/templates/scopes/scope/orgs/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="org.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
diff --git a/ui/core/app/templates/scopes/scope/projects/index.hbs b/ui/core/app/templates/scopes/scope/projects/index.hbs
index fca7f0fae..2c220f15b 100644
--- a/ui/core/app/templates/scopes/scope/projects/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.project.title_plural"}}
-      <DocLink @doc="topics.project" @iconSize="large" />
+      <DocLink @doc="project" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.project.description"}}</p>
@@ -35,7 +35,7 @@
             @title={{project.name}}
             @description={{project.description}}
             @id={{project.id}}
-            @icon="boundary-icons/project"
+            @icon="app-icons/project"
             @route="scopes.scope.projects.project"
             @model={{project.id}}
           />
diff --git a/ui/core/app/templates/scopes/scope/projects/new.hbs b/ui/core/app/templates/scopes/scope/projects/new.hbs
index a8758e3c0..0e9dedf59 100644
--- a/ui/core/app/templates/scopes/scope/projects/new.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="project.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs b/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs
index 5f7845697..e82349443 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs
@@ -1,19 +1,19 @@
 <Rose::Nav::Sidebar @title={{t "titles.resources"}} as |nav|>
   <nav.link @route="scopes.scope.projects.project.sessions">
     <Rose::Icon
-      @name="boundary-icons/action-session"
+      @name="app-icons/action-session"
       @size="medium" />
     {{t "resources.session.title_plural"}}
   </nav.link>
   <nav.link @route="scopes.scope.projects.project.targets">
     <Rose::Icon
-      @name="boundary-icons/target"
+      @name="app-icons/target"
       @size="medium" />
     {{t "resources.target.title_plural"}}
   </nav.link>
   <nav.link @route="scopes.scope.projects.project.host-catalogs">
     <Rose::Icon
-      @name="boundary-icons/host-catalogs"
+      @name="app-icons/host-catalogs"
       @size="medium" />
     {{t "resources.host-catalog.title_plural"}}
   </nav.link>
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 f4d885fae..58e6f4b02 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,6 +1,6 @@
 <h2>
   {{t "resources.host-catalog.title"}}
-  <DocLink @doc="topics.host-catalog" @iconSize="large" />
+  <DocLink @doc="host-catalog" @iconSize="large" />
 </h2>
 <p>{{t "resources.host-catalog.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
index 1d63aa7e0..a101b0a8a 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.host-set.title"}}
-  <DocLink @doc="topics.host-set" @iconSize="large" />
+  <DocLink @doc="host-set" @iconSize="large" />
 </h2>
 <p>{{t "resources.host-set.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs
index ef9992c2c..6ff650141 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.host-set.host.messages.add.title"}}</h2>
-<p>{{t "resources.host-set.host.messages.add.description"}}</p>
\ No newline at end of file
+<h2>
+  {{t "resources.host-set.host.messages.add.title"}}
+  <DocLink @doc="host-set.add-hosts" @iconSize="large" />
+</h2>
+<p>{{t "resources.host-set.host.messages.add.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs
index ace8ccb08..38ae01334 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs
@@ -1 +1,4 @@
-<h2>{{t "titles.new"}}</h2>
\ No newline at end of file
+<h2>
+  {{t "titles.new"}}
+  <DocLink @doc="host-set.new" @iconSize="large" />
+</h2>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
index 3c28edc80..7b15e6f0f 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.host.title"}}
-  <DocLink @doc="topics.host" @iconSize="large" />
+  <DocLink @doc="host" @iconSize="large" />
 </h2>
 <p>{{t "resources.host.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs
index ace8ccb08..3122f3b43 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs
@@ -1 +1,4 @@
-<h2>{{t "titles.new"}}</h2>
\ No newline at end of file
+<h2>
+  {{t "titles.new"}}
+  <DocLink @doc="host.new" @iconSize="large" />
+</h2>
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 120ae0e48..91a17f32d 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
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.host-catalog.title_plural"}}
-      <DocLink @doc="topics.host-catalog" @iconSize="large" />
+      <DocLink @doc="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/host-catalogs/new.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs
index 0d969f874..641fd3ff9 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="host-catalog.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
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 4cb31e30a..02f7a667b 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.project.title"}}
-      <DocLink @doc="topics.project" @iconSize="large" />
+      <DocLink @doc="project" @iconSize="large" />
     </h2>
     <p>{{t "resources.project.description"}}</p>
     <Copyable
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 7ebdf1ece..2271e2473 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
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.session.title_plural"}}
-      <DocLink @doc="topics.session" @iconSize="large" />
+      <DocLink @doc="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 9615a7c2d..6efba5727 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
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.target.title_plural"}}
-      <DocLink @doc="topics.target" @iconSize="large" />
+      <DocLink @doc="target" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.target.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs
index 4ac91435b..f161f252b 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="target.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
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 b94a925a8..14e01c1de 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,6 +1,6 @@
 <h2>
   {{t "resources.target.title"}}
-  <DocLink @doc="topics.target" @iconSize="large" />
+  <DocLink @doc="target" @iconSize="large" />
 </h2>
 <p>{{t "resources.target.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs
index 794392a62..64fc3df9a 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.target.host-set.messages.add.title"}}</h2>
-<p>{{t "resources.target.host-set.messages.add.description"}}</p>
\ No newline at end of file
+<h2>
+  {{t "resources.target.host-set.messages.add.title"}}
+  <DocLink @doc="target.add-host-sets" @iconSize="large" />
+</h2>
+<p>{{t "resources.target.host-set.messages.add.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs
index 2175ad1a9..8acc8ee3a 100644
--- a/ui/core/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.role.title_plural"}}
-      <DocLink @doc="topics.role" @iconSize="large" />
+      <DocLink @doc="role" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.role.description"}}</p>
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 a04e5edc1..142af2e8d 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.role.title"}}
-  <DocLink @doc="topics.role" @iconSize="large" />
+  <DocLink @doc="role" @iconSize="large" />
 </h2>
 <p>{{t "resources.role.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
index 819b49dda..f49d2b130 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.role.principal.messages.add-principals.title"}}</h2>
-<p>{{t "resources.role.principal.messages.add-principals.description"}}</p>
\ No newline at end of file
+<h2>
+  {{t "resources.role.principal.messages.add-principals.title"}}
+  <DocLink @doc="role.add-principals" @iconSize="large" />
+</h2>
+<p>{{t "resources.role.principal.messages.add-principals.description"}}</p>
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 84395fb77..4aea69c7e 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,6 +1,6 @@
 <h2>
   {{t "resources.role.title"}}
-  <DocLink @doc="topics.role" @iconSize="large" />
+  <DocLink @doc="role" @iconSize="large" />
 </h2>
 <p>{{t "resources.role.grant.description"}}</p>
 <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 8854ae095..b6c179259 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,6 +1,6 @@
 <h2>
   {{t "resources.role.title"}}
-  <DocLink @doc="topics.role" @iconSize="large" />
+  <DocLink @doc="role" @iconSize="large" />
 </h2>
 <p>{{t "resources.role.principal.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index ad66923e5..2cc8357ed 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.user.title_plural"}}
-      <DocLink @doc="topics.user" @iconSize="large" />
+      <DocLink @doc="user" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.user.description"}}</p>
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 1f80dcfc5..d6208892e 100644
--- a/ui/core/app/templates/scopes/scope/users/user/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.user.title"}}
-  <DocLink @doc="topics.user" @iconSize="large" />
+  <DocLink @doc="user" @iconSize="large" />
 </h2>
 <p>{{t "resources.user.description"}}</p>
 <Copyable
diff --git a/ui/core/config/environment.js b/ui/core/config/environment.js
index 0eb7294af..35a77d0f3 100644
--- a/ui/core/config/environment.js
+++ b/ui/core/config/environment.js
@@ -41,18 +41,29 @@ module.exports = function (environment) {
     documentation: {
       baseURL: 'https://boundaryproject.io/help/admin-ui',
       topics: {
-        org: '/org',
-        project: '/project',
-        account: '/account',
-        'auth-method': '/auth-method',
-        group: '/group',
-        'host-catalog': '/host-catalog',
-        'host-set': '/host-set',
-        host: '/host',
-        role: '/role',
-        session: '/session',
-        target: '/target',
-        user: '/user'
+        org: '/orgs',
+        'org.new': '/orgs/new',
+        project: '/projects',
+        'project.new': '/projects/new',
+        account: '/accounts',
+        'account.new': '/accounts/new',
+        'auth-method': '/auth-methods',
+        group: '/groups',
+        'group.add-members': '/groups/add-members',
+        'host-catalog': '/host-catalogs',
+        'host-catalog.new': '/host-catalogs/new',
+        'host-set': '/host-sets',
+        'host-set.new': '/host-sets/new',
+        'host-set.add-hosts': '/host-sets/add-hosts',
+        host: '/hosts',
+        'host.new': '/hosts/new',
+        role: '/roles',
+        'role.add-principals': '/roles/add-principals',
+        session: '/sessions',
+        target: '/targets',
+        'target.new': '/targets/new',
+        'target.add-host-sets': '/targets/add-host-sets',
+        user: '/users'
       }
     },
 
diff --git a/ui/core/public/boundary-icons/action-session.svg b/ui/core/public/app-icons/action-session.svg
similarity index 100%
rename from ui/core/public/boundary-icons/action-session.svg
rename to ui/core/public/app-icons/action-session.svg
diff --git a/ui/core/public/boundary-icons/auth-method.svg b/ui/core/public/app-icons/auth-method.svg
similarity index 100%
rename from ui/core/public/boundary-icons/auth-method.svg
rename to ui/core/public/app-icons/auth-method.svg
diff --git a/ui/core/public/boundary-icons/gear.svg b/ui/core/public/app-icons/gear.svg
similarity index 100%
rename from ui/core/public/boundary-icons/gear.svg
rename to ui/core/public/app-icons/gear.svg
diff --git a/ui/core/public/boundary-icons/group.svg b/ui/core/public/app-icons/group.svg
similarity index 100%
rename from ui/core/public/boundary-icons/group.svg
rename to ui/core/public/app-icons/group.svg
diff --git a/ui/core/public/boundary-icons/host-catalogs.svg b/ui/core/public/app-icons/host-catalogs.svg
similarity index 100%
rename from ui/core/public/boundary-icons/host-catalogs.svg
rename to ui/core/public/app-icons/host-catalogs.svg
diff --git a/ui/core/public/boundary-icons/org.svg b/ui/core/public/app-icons/org.svg
similarity index 100%
rename from ui/core/public/boundary-icons/org.svg
rename to ui/core/public/app-icons/org.svg
diff --git a/ui/core/public/boundary-icons/project.svg b/ui/core/public/app-icons/project.svg
similarity index 100%
rename from ui/core/public/boundary-icons/project.svg
rename to ui/core/public/app-icons/project.svg
diff --git a/ui/core/public/boundary-icons/roles.svg b/ui/core/public/app-icons/roles.svg
similarity index 100%
rename from ui/core/public/boundary-icons/roles.svg
rename to ui/core/public/app-icons/roles.svg
diff --git a/ui/core/public/boundary-icons/target.svg b/ui/core/public/app-icons/target.svg
similarity index 100%
rename from ui/core/public/boundary-icons/target.svg
rename to ui/core/public/app-icons/target.svg
diff --git a/ui/core/public/boundary-icons/user-profile.svg b/ui/core/public/app-icons/user-profile.svg
similarity index 100%
rename from ui/core/public/boundary-icons/user-profile.svg
rename to ui/core/public/app-icons/user-profile.svg
diff --git a/ui/core/public/boundary-icons/users.svg b/ui/core/public/app-icons/users.svg
similarity index 100%
rename from ui/core/public/boundary-icons/users.svg
rename to ui/core/public/app-icons/users.svg
diff --git a/ui/core/public/logo-boundary.svg b/ui/core/public/logo-app.svg
similarity index 100%
rename from ui/core/public/logo-boundary.svg
rename to ui/core/public/logo-app.svg
diff --git a/ui/core/public/logo-hashi.svg b/ui/core/public/logo-company.svg
similarity index 100%
rename from ui/core/public/logo-hashi.svg
rename to ui/core/public/logo-company.svg
diff --git a/ui/core/public/logo.svg b/ui/core/public/logo.svg
deleted file mode 100644
index 2a28cc024..000000000
--- a/ui/core/public/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.278 9.313a2.021 2.021 0 0 1-2.01-.951c-.552-.928-.224-2.115.732-2.65.956-.536 2.179-.218 2.732.71.407.684.346 1.54-.155 2.164l2.354 3.955c2.02-.731 4.352.038 5.466 1.91 1.242 2.087.504 4.76-1.647 5.964a4.608 4.608 0 0 1-3.51.41l.474-1.383c.77.204 1.594.1 2.286-.288 1.434-.804 1.925-2.583 1.098-3.975a3.006 3.006 0 0 0-2.193-1.429 3.059 3.059 0 0 0-2.507.807l-3.12-5.244zm3.367 6.592a2.003 2.003 0 0 1 1.855-1.213c1.104 0 2 .87 2 1.94 0 1.072-.896 1.94-2 1.941-.815 0-1.549-.48-1.855-1.213h-4.707C10.58 19.424 8.728 21 6.5 21c-2.484 0-4.5-1.957-4.5-4.366 0-1.24.533-2.358 1.389-3.153l.997 1.088a2.859 2.859 0 0 0-.886 2.065c0 1.607 1.343 2.91 3 2.91.928 0 1.803-.417 2.371-1.128a2.844 2.844 0 0 0 .534-2.51h6.24zm-7.568-.49c.501.623.562 1.479.155 2.164-.553.927-1.775 1.245-2.732.71-.956-.536-1.284-1.723-.732-2.65a2.022 2.022 0 0 1 2.01-.953l2.354-3.955c-1.664-1.332-2.143-3.676-1.03-5.548C9.345 3.096 12.1 2.38 14.25 3.585a4.37 4.37 0 0 1 2.12 2.744l-1.47.293a2.915 2.915 0 0 0-1.4-1.777c-1.435-.802-3.269-.326-4.098 1.065a2.835 2.835 0 0 0-.179 2.557 2.973 2.973 0 0 0 1.974 1.704l-3.12 5.243z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/ui/core/tests/integration/.gitkeep b/ui/core/tests/integration/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/core/tests/integration/components/doc-link-test.js b/ui/core/tests/integration/components/doc-link-test.js
index 36947afcc..43d0b9a1c 100644
--- a/ui/core/tests/integration/components/doc-link-test.js
+++ b/ui/core/tests/integration/components/doc-link-test.js
@@ -8,7 +8,7 @@ module('Integration | Component | doc-link', function(hooks) {
 
   test('it renders', async function(assert) {
     assert.expect(1);
-    await render(hbs`<DocLink @doc="topics.account" @iconSize="large" />`);
+    await render(hbs`<DocLink @doc="account" @iconSize="large" />`);
     assert.ok(find('.doc-link .rose-icon.large'));
   });
 });
diff --git a/ui/core/tests/integration/helpers/doc-url-test.js b/ui/core/tests/integration/helpers/doc-url-test.js
index d91c9eeed..d4263c1eb 100644
--- a/ui/core/tests/integration/helpers/doc-url-test.js
+++ b/ui/core/tests/integration/helpers/doc-url-test.js
@@ -11,7 +11,7 @@ module('Integration | Helper | doc-url', function(hooks) {
     assert.expect(3);
     const baseURL = config.documentation.baseURL;
     const path = config.documentation.topics.account;
-    await render(hbs`{{doc-url 'topics.account'}}`);
+    await render(hbs`{{doc-url 'account'}}`);
     assert.ok(baseURL);
     assert.ok(path);
     assert.equal(this.element.textContent.trim(), `${baseURL}${path}`);
@@ -20,7 +20,7 @@ module('Integration | Helper | doc-url', function(hooks) {
   test('it throws an error if the specified documentation path cannot be found', async function(assert) {
     assert.expect(2);
     const helper = this.owner.lookup('helper:doc-url');
-    assert.ok(helper.compute(['topics.account']), 'Specified document exists.')
+    assert.ok(helper.compute(['account']), 'Specified document exists.')
     assert.throws(() => {
       helper.compute(['no.such.doc']);
     }, 'Specified documentation was not found, so the helper threw an error.');
diff --git a/ui/core/tests/unit/.gitkeep b/ui/core/tests/unit/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml
index fccc4b485..bdb87f84a 100644
--- a/ui/core/translations/resources/en-us.yaml
+++ b/ui/core/translations/resources/en-us.yaml
@@ -107,14 +107,14 @@ session:
 org:
   title: Organization
   title_plural: Organizations
-  description: An organization is a type of scope used to organize projects and IAM resources.  Organizations contain projects and is a child scope of global.
+  description: An organization is a type of scope used to organize projects and IAM resources.  Organizations are child scopes of the global scope.
   messages:
     welcome:
       title: Welcome to Organizations
 project:
   title: Project
   title_plural: Projects
-  description: A project is a type of scope used to organize resources such as by targets and host catalogs.
+  description: A project is a type of scope used to organize resources such as targets and host catalogs.
   messages:
     welcome:
       title: Welcome to Projects
diff --git a/ui/core/vendor/.gitkeep b/ui/core/vendor/.gitkeep
deleted file mode 100644
index e69de29bb..000000000