diff --git a/docs/Gemfile b/docs/Gemfile
index 37f5eaa42..fff91148c 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
+gem 'jekyll-octicons'
 gem 'github-pages', group: :jekyll_plugins
diff --git a/docs/_config.yml b/docs/_config.yml
index 7b538d7f5..c86b158fb 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -4,6 +4,8 @@ collections_dir: collections
 collections:
   development:
     output: true
+plugins:
+  - jekyll-octicons    
 defaults:
   - scope:
       path: ""
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index ab65ec216..61d17f9db 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -1,7 +1,7 @@
 <footer class="nav-footer wrap">
 <div class="nav-refs">
 <a href="https://github.com/larshp/abapGit">
-<span class="mega-octicon octicon-mark-github"></span>
+{% octicon mark-github height:32 %}
 </a>
 </div>
 <footer>
diff --git a/docs/_includes/head.html b/docs/_includes/head.html
index 0d8e062f8..4cf36adf4 100644
--- a/docs/_includes/head.html
+++ b/docs/_includes/head.html
@@ -3,7 +3,6 @@
 <link rel="shortcut icon" type="image/png" href="/img/favicon.png">
 <link rel="stylesheet" href="/assets/main.css">
 <link rel="stylesheet" href="/assets/highlight.css">
-<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.min.css">
 <title>{% if page.title %}{{ site.title }} - {{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
 <meta name="description" content="{% if page.title %}{{ site.title }} - {{ page.title }}{% else %}{{ site.title }} - Home{% endif %}" />
 <meta name="keywords" content="abapGit,abapGit documentation" />
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 2539bced2..ab9902b47 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -1,6 +1,6 @@
 <div class="page-head">
 <div class="wrap">
 <a href="/"><img class="head-logo" src="/img/logo.svg" height="40" alt="abapGit"></a>
-<span class="head-title"> &#x25BA; documentation</span>
+<span class="head-title"> {% octicon triangle-right %} documentation</span>
 </div>
 </div>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 8df461838..8d8ea465d 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -9,6 +9,7 @@
   </div>
   <div class="content">
   <h1>{{ page.title }}</h1>
+  <small><a href="{{ site.github.repository_url }}/tree/master/docs/{{ page.path }}">{% octicon pencil %} Improve this page</a></small>
   {{ content }}
   </div>
 </div>
diff --git a/docs/_layouts/development.html b/docs/_layouts/development.html
index 6ddf3a74c..c21134b4a 100644
--- a/docs/_layouts/development.html
+++ b/docs/_layouts/development.html
@@ -19,6 +19,7 @@
 
 <div class="content">
 <h1>{{ page.title }}</h1>
+<small><a href="{{ site.github.repository_url }}/tree/master/docs/collections/{{ page.path }}">{% octicon pencil %} Improve this page</a></small>
 {{ content }}
 </div>
 </div>
diff --git a/docs/collections/_development/docs.md b/docs/collections/_development/docs.md
index 38b35ac81..a749c4ccd 100644
--- a/docs/collections/_development/docs.md
+++ b/docs/collections/_development/docs.md
@@ -6,6 +6,8 @@ order: 200
 abapGit uses [github pages](https://help.github.com/articles/what-is-github-pages/) for documentation,
 all pages are generated statically using [Jekyll](https://jekyllrb.com/)
 
+[Octicons in jekyll](https://github.com/primer/octicons/tree/master/lib/octicons_jekyll)
+
 Building /docs/ locally:
 
 `bundle install`