diff --git a/HISTORY.md b/HISTORY.md
index 84cf78e..21acfc6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,7 @@
+### v2.0.4
+* Fix font icons issue as GitHub switches to SVG
+* Fix toggle button position when GitLab is in compact mode
+
 ### v2.0.3
 * Fix bug cannot load Octotree in GitHub Enterprise
 * No longer need to login to GitLab before showing tree
diff --git a/fonts/octicons.woff b/fonts/octicons.woff
new file mode 100644
index 0000000..3ad0b8e
Binary files /dev/null and b/fonts/octicons.woff differ
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 5a5a1a2..b84a9b7 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -67,6 +67,7 @@ gulp.task('chrome:js', ['chrome:template', 'lib:ondemand'], () => {
 gulp.task('chrome', ['chrome:js'], () => {
   return merge(
     pipe('./icons/**/*', './tmp/chrome/icons'),
+    pipe('./fonts/**/*', './tmp/chrome/fonts'),
     pipe(['./libs/**/*', '!./libs/ondemand{,/**}', './tmp/octotree.*', './tmp/ondemand.js', './src/config/chrome/manifest.json'], './tmp/chrome/'),
     pipe('./src/config/chrome/background.js', $.babel(), './tmp/chrome/')
   )
diff --git a/package.json b/package.json
index 44a90bc..9a5a002 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "octotree",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Code tree for GitHub and GitLab",
   "main": "inject.js",
   "scripts": {
diff --git a/src/adapters/github.less b/src/adapters/github.less
index 104c24d..2ebbd4c 100644
--- a/src/adapters/github.less
+++ b/src/adapters/github.less
@@ -1,3 +1,10 @@
+@font-face {
+  font-family: 'octicons';
+  src: url('chrome-extension://__MSG_@@extension_id__/fonts/octicons.woff') format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
+
 .octotree {
   .octotree_github_only {
     display: none;
diff --git a/src/config/chrome/manifest.json b/src/config/chrome/manifest.json
index 9270888..b022e16 100755
--- a/src/config/chrome/manifest.json
+++ b/src/config/chrome/manifest.json
@@ -19,5 +19,8 @@
   "background": {
     "scripts": [ "background.js" ],
     "persistent": false
-  }
+  },
+  "web_accessible_resources": [
+    "fonts/*.woff"
+  ]
 }