diff --git a/_includes/edit_button.html b/_includes/edit_button.html
new file mode 100644
index 0000000..f5d5ac8
--- /dev/null
+++ b/_includes/edit_button.html
@@ -0,0 +1 @@
+<a style="float: right;" role="button" class="btn btn-outline-primary" href="https://github.com/{{ site.github_username }}/{{ site.github_username }}.github.io/edit/master/{{ page.path}}">Edit <i class="fa fa-pencil-square-o"></i></a>
diff --git a/_layouts/architecture.html b/_layouts/architecture.html
index d07f8c4..b5cad22 100644
--- a/_layouts/architecture.html
+++ b/_layouts/architecture.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 <h1>{{ page.title }}
-  <a style="float: right;" class="btn btn-raised btn-xs" href="https://github.com/{{ site.github_username }}/{{ site.github_username }}.github.io/edit/master/{{ page.path}}">Edit <i class="glyphicon glyphicon-edit"></i></a>
+  {% include edit_button.html %}
 </h1>
 <p>
   <i>Version {{ page.version}}</i><br />
diff --git a/_layouts/page.html b/_layouts/page.html
index 24a26a1..94c97fb 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -4,6 +4,6 @@
 
 <h1>
   {{ page.title }}
-  <a style="float: right;" role="button" class="btn btn-outline-primary" href="https://github.com/{{ site.github_username }}/{{ site.github_username }}.github.io/edit/master/{{ page.path}}">Edit <i class="fa fa-pencil-square-o"></i></a>
+  {% include edit_button.html %}
 </h1>
 {{ content }}
diff --git a/_layouts/post.html b/_layouts/post.html
index bcf24e0..194d7cf 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 <h1>{{ page.title }}
-  <a style="float: right;" class="btn btn-raised btn-xs" href="https://github.com/{{ site.github_username }}/{{ site.github_username }}.github.io/edit/master/{{ page.path}}">Edit <i class="glyphicon glyphicon-edit"></i></a>
+  {% include edit_button.html %}
 </h1>
 <p>Published on {{ page.date | date: "%b %-d, %Y" }}{% if page.github_username %} by <a href="https://github.com/{{page.github_username}}">{{ page.github_username }}</a>{% endif %}. {% if page.last_updater %}Last updated on {{ page.last_modified_at | date: "%b %-d, %Y" }}{% if page.last_updater %} by <a href="https://github.com/{{page.last_updater}}">{{ page.last_updater }}{% endif %}</a>.{% endif %}</p>
 <article>