diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
index 0e68b1907..ba86f1b86 100644
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -27,7 +27,7 @@
         <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
       }
       @if(hasWritePermission){
-        <a href="@url(repository)/new/@encodeRefName(branch)/@pathList.mkString("/")"><img src="@assets/common/images/newfile.png"/></a>
+        <a href="@url(repository)/new/@encodeRefName(branch)/@pathList.mkString("/")" title="Create a new file here" style="text-decoration: none;">+</i></a>
       }
     </div>
     <table class="table table-file-list">
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 3af0520d0..3f92d831c 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1360,13 +1360,15 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child {
 
 a.markdown-anchor-link {
   position: absolute;
-  left: -20px;
-  width: 32px;
-  height: 16px;
-  background-image: url(../images/link.png);
-  background-repeat: no-repeat;
+  left: -18px;
   display: none;
+  color: #999;
+  /* From octicon style */
+  font: normal normal normal 16px/1 octicons;
+  text-decoration: none;
+  text-rendering: auto;
 }
+a.markdown-anchor-link:before { content: '\f05c'} /*  */
 
 h1 a.markdown-anchor-link {
   top: 24px;
diff --git a/src/main/webapp/assets/common/images/activity-branch.png b/src/main/webapp/assets/common/images/activity-branch.png
deleted file mode 100644
index a995e2926..000000000
Binary files a/src/main/webapp/assets/common/images/activity-branch.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-comment.png b/src/main/webapp/assets/common/images/activity-comment.png
deleted file mode 100644
index 3d3674085..000000000
Binary files a/src/main/webapp/assets/common/images/activity-comment.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-commit.png b/src/main/webapp/assets/common/images/activity-commit.png
deleted file mode 100644
index 562b9901b..000000000
Binary files a/src/main/webapp/assets/common/images/activity-commit.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-create-repository.png b/src/main/webapp/assets/common/images/activity-create-repository.png
deleted file mode 100644
index 17fe6d17d..000000000
Binary files a/src/main/webapp/assets/common/images/activity-create-repository.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-delete.png b/src/main/webapp/assets/common/images/activity-delete.png
deleted file mode 100644
index 4ad4b6416..000000000
Binary files a/src/main/webapp/assets/common/images/activity-delete.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-fork.png b/src/main/webapp/assets/common/images/activity-fork.png
deleted file mode 100644
index bd370edaa..000000000
Binary files a/src/main/webapp/assets/common/images/activity-fork.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-issue-close.png b/src/main/webapp/assets/common/images/activity-issue-close.png
deleted file mode 100644
index b91d3889f..000000000
Binary files a/src/main/webapp/assets/common/images/activity-issue-close.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-issue-reopen.png b/src/main/webapp/assets/common/images/activity-issue-reopen.png
deleted file mode 100644
index acc7865b2..000000000
Binary files a/src/main/webapp/assets/common/images/activity-issue-reopen.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-issue.png b/src/main/webapp/assets/common/images/activity-issue.png
deleted file mode 100644
index af2475960..000000000
Binary files a/src/main/webapp/assets/common/images/activity-issue.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-merge.png b/src/main/webapp/assets/common/images/activity-merge.png
deleted file mode 100644
index 4aa4ddcc3..000000000
Binary files a/src/main/webapp/assets/common/images/activity-merge.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-tag.png b/src/main/webapp/assets/common/images/activity-tag.png
deleted file mode 100644
index 0fea83e87..000000000
Binary files a/src/main/webapp/assets/common/images/activity-tag.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/activity-wiki.png b/src/main/webapp/assets/common/images/activity-wiki.png
deleted file mode 100644
index 01844b4f9..000000000
Binary files a/src/main/webapp/assets/common/images/activity-wiki.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/alert.png b/src/main/webapp/assets/common/images/alert.png
deleted file mode 100644
index 10545e755..000000000
Binary files a/src/main/webapp/assets/common/images/alert.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/branch.png b/src/main/webapp/assets/common/images/branch.png
deleted file mode 100644
index 89e600ca2..000000000
Binary files a/src/main/webapp/assets/common/images/branch.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/clear.png b/src/main/webapp/assets/common/images/clear.png
deleted file mode 100644
index caae99846..000000000
Binary files a/src/main/webapp/assets/common/images/clear.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/clear_hover.png b/src/main/webapp/assets/common/images/clear_hover.png
deleted file mode 100644
index 8b8fd0c49..000000000
Binary files a/src/main/webapp/assets/common/images/clear_hover.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/comment-active.png b/src/main/webapp/assets/common/images/comment-active.png
deleted file mode 100644
index c602773bc..000000000
Binary files a/src/main/webapp/assets/common/images/comment-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/comment.png b/src/main/webapp/assets/common/images/comment.png
deleted file mode 100644
index 182020751..000000000
Binary files a/src/main/webapp/assets/common/images/comment.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/diff_add.png b/src/main/webapp/assets/common/images/diff_add.png
deleted file mode 100644
index 853f7c058..000000000
Binary files a/src/main/webapp/assets/common/images/diff_add.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/diff_delete.png b/src/main/webapp/assets/common/images/diff_delete.png
deleted file mode 100644
index f5e36ea39..000000000
Binary files a/src/main/webapp/assets/common/images/diff_delete.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/diff_edit.png b/src/main/webapp/assets/common/images/diff_edit.png
deleted file mode 100644
index c0e0b0632..000000000
Binary files a/src/main/webapp/assets/common/images/diff_edit.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/diff_move.png b/src/main/webapp/assets/common/images/diff_move.png
deleted file mode 100644
index 25a9c1eb0..000000000
Binary files a/src/main/webapp/assets/common/images/diff_move.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/file.png b/src/main/webapp/assets/common/images/file.png
deleted file mode 100644
index 8b8b1ca00..000000000
Binary files a/src/main/webapp/assets/common/images/file.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/folder.png b/src/main/webapp/assets/common/images/folder.png
deleted file mode 100644
index 784e8fa48..000000000
Binary files a/src/main/webapp/assets/common/images/folder.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/folder_link.png b/src/main/webapp/assets/common/images/folder_link.png
deleted file mode 100644
index b9b75f6c3..000000000
Binary files a/src/main/webapp/assets/common/images/folder_link.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/header-branches-hover.png b/src/main/webapp/assets/common/images/header-branches-hover.png
deleted file mode 100644
index 7e2668a02..000000000
Binary files a/src/main/webapp/assets/common/images/header-branches-hover.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/header-branches.png b/src/main/webapp/assets/common/images/header-branches.png
deleted file mode 100644
index c661dd28a..000000000
Binary files a/src/main/webapp/assets/common/images/header-branches.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/header-commits-hover.png b/src/main/webapp/assets/common/images/header-commits-hover.png
deleted file mode 100644
index c2bc8db48..000000000
Binary files a/src/main/webapp/assets/common/images/header-commits-hover.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/header-commits.png b/src/main/webapp/assets/common/images/header-commits.png
deleted file mode 100644
index d982329c5..000000000
Binary files a/src/main/webapp/assets/common/images/header-commits.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/header-tags-hover.png b/src/main/webapp/assets/common/images/header-tags-hover.png
deleted file mode 100644
index ae23c2b09..000000000
Binary files a/src/main/webapp/assets/common/images/header-tags-hover.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/header-tags.png b/src/main/webapp/assets/common/images/header-tags.png
deleted file mode 100644
index bfdbc02f0..000000000
Binary files a/src/main/webapp/assets/common/images/header-tags.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/issue-closed.png b/src/main/webapp/assets/common/images/issue-closed.png
deleted file mode 100644
index 9e70e5b5b..000000000
Binary files a/src/main/webapp/assets/common/images/issue-closed.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/issue-open.png b/src/main/webapp/assets/common/images/issue-open.png
deleted file mode 100644
index b1e778585..000000000
Binary files a/src/main/webapp/assets/common/images/issue-open.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/label_black.png b/src/main/webapp/assets/common/images/label_black.png
deleted file mode 100644
index e548b0efb..000000000
Binary files a/src/main/webapp/assets/common/images/label_black.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/label_white.png b/src/main/webapp/assets/common/images/label_white.png
deleted file mode 100644
index 52d413928..000000000
Binary files a/src/main/webapp/assets/common/images/label_white.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/link.png b/src/main/webapp/assets/common/images/link.png
deleted file mode 100644
index 25eacb7c2..000000000
Binary files a/src/main/webapp/assets/common/images/link.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-code-active.png b/src/main/webapp/assets/common/images/menu-code-active.png
deleted file mode 100644
index 371061c74..000000000
Binary files a/src/main/webapp/assets/common/images/menu-code-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-code.png b/src/main/webapp/assets/common/images/menu-code.png
deleted file mode 100644
index d47af04b8..000000000
Binary files a/src/main/webapp/assets/common/images/menu-code.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-feed.png b/src/main/webapp/assets/common/images/menu-feed.png
deleted file mode 100644
index 581384725..000000000
Binary files a/src/main/webapp/assets/common/images/menu-feed.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-issues-active.png b/src/main/webapp/assets/common/images/menu-issues-active.png
deleted file mode 100644
index 298781f66..000000000
Binary files a/src/main/webapp/assets/common/images/menu-issues-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-issues.png b/src/main/webapp/assets/common/images/menu-issues.png
deleted file mode 100644
index 956af1a4a..000000000
Binary files a/src/main/webapp/assets/common/images/menu-issues.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-pulls-active.png b/src/main/webapp/assets/common/images/menu-pulls-active.png
deleted file mode 100644
index 734cb165e..000000000
Binary files a/src/main/webapp/assets/common/images/menu-pulls-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-pulls.png b/src/main/webapp/assets/common/images/menu-pulls.png
deleted file mode 100644
index c9243fdaf..000000000
Binary files a/src/main/webapp/assets/common/images/menu-pulls.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-settings-active.png b/src/main/webapp/assets/common/images/menu-settings-active.png
deleted file mode 100644
index 03b1c0376..000000000
Binary files a/src/main/webapp/assets/common/images/menu-settings-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-settings.png b/src/main/webapp/assets/common/images/menu-settings.png
deleted file mode 100644
index ab8f05cf2..000000000
Binary files a/src/main/webapp/assets/common/images/menu-settings.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-wiki-active.png b/src/main/webapp/assets/common/images/menu-wiki-active.png
deleted file mode 100644
index ff193b71d..000000000
Binary files a/src/main/webapp/assets/common/images/menu-wiki-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/menu-wiki.png b/src/main/webapp/assets/common/images/menu-wiki.png
deleted file mode 100644
index 48ea4959d..000000000
Binary files a/src/main/webapp/assets/common/images/menu-wiki.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/milestone-active.png b/src/main/webapp/assets/common/images/milestone-active.png
deleted file mode 100644
index 68f548696..000000000
Binary files a/src/main/webapp/assets/common/images/milestone-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/milestone.png b/src/main/webapp/assets/common/images/milestone.png
deleted file mode 100644
index 76e83aacf..000000000
Binary files a/src/main/webapp/assets/common/images/milestone.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/newfile.png b/src/main/webapp/assets/common/images/newfile.png
deleted file mode 100644
index e4b20fbf6..000000000
Binary files a/src/main/webapp/assets/common/images/newfile.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/pullreq-closed.png b/src/main/webapp/assets/common/images/pullreq-closed.png
deleted file mode 100644
index 71d549771..000000000
Binary files a/src/main/webapp/assets/common/images/pullreq-closed.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/pullreq-open.png b/src/main/webapp/assets/common/images/pullreq-open.png
deleted file mode 100644
index 20a769d96..000000000
Binary files a/src/main/webapp/assets/common/images/pullreq-open.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/repo_fork.png b/src/main/webapp/assets/common/images/repo_fork.png
deleted file mode 100644
index 576ec19dd..000000000
Binary files a/src/main/webapp/assets/common/images/repo_fork.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/repo_fork_lg.png b/src/main/webapp/assets/common/images/repo_fork_lg.png
deleted file mode 100644
index 060a39763..000000000
Binary files a/src/main/webapp/assets/common/images/repo_fork_lg.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/repo_private.png b/src/main/webapp/assets/common/images/repo_private.png
deleted file mode 100644
index 5f5e8ad4e..000000000
Binary files a/src/main/webapp/assets/common/images/repo_private.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/repo_private_lg.png b/src/main/webapp/assets/common/images/repo_private_lg.png
deleted file mode 100644
index cccc4953e..000000000
Binary files a/src/main/webapp/assets/common/images/repo_private_lg.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/repo_public.png b/src/main/webapp/assets/common/images/repo_public.png
deleted file mode 100644
index 66f3f2116..000000000
Binary files a/src/main/webapp/assets/common/images/repo_public.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/repo_public_lg.png b/src/main/webapp/assets/common/images/repo_public_lg.png
deleted file mode 100644
index 4b5527e94..000000000
Binary files a/src/main/webapp/assets/common/images/repo_public_lg.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/status-closed-active.png b/src/main/webapp/assets/common/images/status-closed-active.png
deleted file mode 100644
index ab400e6f2..000000000
Binary files a/src/main/webapp/assets/common/images/status-closed-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/status-closed.png b/src/main/webapp/assets/common/images/status-closed.png
deleted file mode 100644
index 951cad356..000000000
Binary files a/src/main/webapp/assets/common/images/status-closed.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/status-open-active.png b/src/main/webapp/assets/common/images/status-open-active.png
deleted file mode 100644
index 77dab61f7..000000000
Binary files a/src/main/webapp/assets/common/images/status-open-active.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/status-open.png b/src/main/webapp/assets/common/images/status-open.png
deleted file mode 100644
index 1d7f9edbc..000000000
Binary files a/src/main/webapp/assets/common/images/status-open.png and /dev/null differ
diff --git a/src/main/webapp/assets/common/images/tag.png b/src/main/webapp/assets/common/images/tag.png
deleted file mode 100644
index 9dd239f71..000000000
Binary files a/src/main/webapp/assets/common/images/tag.png and /dev/null differ