diff --git a/app/index.html b/app/index.html
index e487190c7..14145dd88 100644
--- a/app/index.html
+++ b/app/index.html
@@ -10,7 +10,7 @@
     {{content-for "head"}}
 
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/app.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-api-docs.css">
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600" rel="stylesheet">
 
     {{content-for "head-footer"}}
diff --git a/app/styles/app.css b/app/styles/app.css
index e69de29bb..2e9c20021 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -0,0 +1,27 @@
+.article-title-wrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.module-name {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.access {
+  color: #fff;
+  background-color: var(--color-gray-600);
+  margin-left: var(--spacing-1);
+  padding: 0.25rem var(--spacing-1);
+  font-size: var(--font-size-md);
+  border-radius: var(--radius);
+  vertical-align: middle;
+}
+
+main a.edit-icon {
+  height: 1rem;
+  width: 16px;
+  display: inline-block;
+  background: none;
+}
diff --git a/app/templates/project-version/classes/class.hbs b/app/templates/project-version/classes/class.hbs
index cd566f5bd..174cd17c2 100644
--- a/app/templates/project-version/classes/class.hbs
+++ b/app/templates/project-version/classes/class.hbs
@@ -1,10 +1,15 @@
 {{! template-lint-disable no-action }}
 <article class="chapter">
-  {{#if (and @model.project.id @model.file @model.line (is-latest version=@model.projectVersion.version allVersions=this.allVersions))}}
-    <a data-tooltip="Edit on Github" class="heading__link__edit" href="{{github-link @model.project.id @model.projectVersion.version @model.file @model.line isEdit=true}}" target="_blank" rel="noopener noreferrer">{{svg-jar "fa-pencil"}}</a>
-  {{/if}}
-  <h1 class="module-name">Class {{@model.name}}</h1>
-  {{#if @model.access}}<span class="access">{{@model.access}}</span>{{/if}}
+  <div class="article-title-wrapper">
+    <h1 class="module-name">Class {{@model.name}}
+      {{#if @model.access}}
+        <span class="access">{{@model.access}}</span>
+      {{/if}}
+    </h1>
+    {{#if (and @model.project.id @model.file @model.line (is-latest version=@model.projectVersion.version allVersions=this.allVersions))}}
+      <a data-tooltip="Edit on Github" class="edit-icon" href="{{github-link @model.project.id @model.projectVersion.version @model.file @model.line isEdit=true}}" target="_blank" rel="noopener noreferrer">{{svg-jar "pen"}}</a>
+    {{/if}}
+  </div>
   <hr>
   <div class="attributes">
     {{#if @model.extends}}
diff --git a/app/templates/project-version/modules/module.hbs b/app/templates/project-version/modules/module.hbs
index e78331394..673000d4d 100644
--- a/app/templates/project-version/modules/module.hbs
+++ b/app/templates/project-version/modules/module.hbs
@@ -1,10 +1,13 @@
 <article class="chapter">
-  {{#if (eq this.model.name 'ember-data-overview')}}
-    <h1 class="module-name">EmberData Overview</h1>
-  {{else}}
-    <h1 class="module-name">Package {{this.model.name}}</h1>
-  {{/if}}
-  {{#if this.model.access}}<span class="access">{{this.model.access}}</span>{{/if}}
+  <div class="article-title-wrapper">
+    {{#if (eq this.model.name 'ember-data-overview')}}
+      <h1 class="module-name">EmberData Overview</h1>
+    {{else}}
+      <h1 class="module-name">Package {{this.model.name}}
+        {{#if this.model.access}}<span class="access">{{this.model.access}}</span>{{/if}}
+      </h1>
+    {{/if}}
+  </div>
   <hr>
 
   <p class="attributes">
diff --git a/public/assets/images/pen.svg b/public/assets/images/pen.svg
new file mode 100644
index 000000000..cb118d199
--- /dev/null
+++ b/public/assets/images/pen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. --><path fill="#E04E39" d="M362.7 19.3L314.3 67.7 444.3 197.7l48.4-48.4c25-25 25-65.5 0-90.5L453.3 19.3c-25-25-65.5-25-90.5 0zm-71 71L58.6 323.5c-10.4 10.4-18 23.3-22.2 37.4L1 481.2C-1.5 489.7 .8 498.8 7 505s15.3 8.5 23.7 6.1l120.3-35.4c14.1-4.2 27-11.8 37.4-22.2L421.7 220.3 291.7 90.3z"/></svg>
diff --git a/tests/acceptance/release-url-test.js b/tests/acceptance/release-url-test.js
index 2c8ca4dd4..93f9497db 100644
--- a/tests/acceptance/release-url-test.js
+++ b/tests/acceptance/release-url-test.js
@@ -7,6 +7,6 @@ module('Acceptance | release URL', function (hooks) {
 
   test('specifying release instead of specific version in URL should go to the latest release', async function (assert) {
     await visit('ember/release/classes/Application');
-    assert.dom('h1.module-name').hasText('Class Application');
+    assert.dom('h1.module-name').includesText('Class Application');
   });
 });