diff --git a/website/assets/images/pencil-16x16@2x.png b/website/assets/images/pencil-16x16@2x.png
new file mode 100644
index 0000000000..4bb2c0ceaa
Binary files /dev/null and b/website/assets/images/pencil-16x16@2x.png differ
diff --git a/website/assets/styles/pages/articles/basic-article.less b/website/assets/styles/pages/articles/basic-article.less
index 4dfe99c4b3..e7b5632fae 100644
--- a/website/assets/styles/pages/articles/basic-article.less
+++ b/website/assets/styles/pages/articles/basic-article.less
@@ -28,17 +28,45 @@
     padding: 4px 8px;
     display: inline;
     max-width: min-content;
-    color: #192147;
+    color: @core-fleet-black-75;
     text-decoration: none;
     font-size: 14px;
+    border-radius: 6px;
     span::before {
       vertical-align: baseline;
       font-family: 'FontAwesome';
       content: '\f09e';
-      color: #192147;
       padding-right: 8px;
       font-size: 16px;
     }
+    &:hover {
+      background-color: rgba(25,33,71,.05);
+    }
+    &:active{
+      background-color: rgba(25,33,71,.1);
+    }
+  }
+  [purpose='edit-button'] {
+    margin-left: 24px;
+    img {
+      width: 16px;
+      height: 16px;
+      display: inline;
+      margin-right: 8px;
+    }
+    padding: 4px 8px;
+    display: block;
+    color: @core-fleet-black-75;
+    text-decoration: none;
+    font-size: 14px;
+    line-height: 21px;
+    border-radius: 6px;
+    &:hover {
+      background-color: rgba(25,33,71,.05);
+    }
+    &:active{
+      background-color: rgba(25,33,71,.1);
+    }
   }
   [purpose='article-details'] {
     font-size: 14px;
diff --git a/website/views/pages/articles/basic-article.ejs b/website/views/pages/articles/basic-article.ejs
index 43b30a477e..646efdd21d 100644
--- a/website/views/pages/articles/basic-article.ejs
+++ b/website/views/pages/articles/basic-article.ejs
@@ -11,7 +11,10 @@
       <img style="height: 28px; width: 28px; border-radius: 100%;" alt="The author's GitHub profile picture" :src="'https://github.com/'+thisPage.meta.authorGitHubUsername+'.png?size=200'">
       <p class="pl-2 font-weight-bold"><%=thisPage.meta.authorFullName %></p>
       </div>
-      <a purpose="rss-button" class="px-0 px-sm-2 pt-3 pt-sm-1" taget="_blank" :href="'/rss/'+articleCategorySlug"><span>Subscribe</span></a>
+      <div class="d-flex flex-row align-items-center pt-3 pt-sm-1">
+      <a purpose="rss-button" target="_blank" :href="'/rss/'+articleCategorySlug"><span>Subscribe</span></a>
+      <a purpose="edit-button" class="d-flex flex-row align-items-center" target="_blank" :href="'https://github.com/fleetdm/fleet/edit/main/articles/'+thisPage.sectionRelativeRepoPath"><img alt="A pencil icon" src="/images/pencil-16x16@2x.png">Edit page</span></a>
+      </div>
     </div>
     <div purpose="article-content" class="d-flex flex-column" parasails-has-no-page-script>
       <%- partial(path.relative(path.dirname(__filename), path.resolve( sails.config.appPath, path.join(sails.config.builtStaticContent.compiledPagePartialsAppPath, thisPage.htmlId)))) %>