diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 4f68199c0..88d2c887d 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1964,6 +1964,26 @@ textarea#issue-add-content {
   height: 120px;
   resize: vertical;
 }
+#issue-list-nav li > a {
+  font-size: 13px;
+  font-weight: bold;
+  padding: .4em .9em;
+  border-radius: .3em;
+}
+#issue-list-nav li.current > a {
+  background-color: #0079bc;
+  color: #FAFAFA;
+  border-radius: .3em;
+}
+#issue-list-nav li.right {
+  margin-left: 4px;
+}
+#issue-new > a {
+  padding: 0 !important;
+}
+#issue-new > a button {
+  height: 34px;
+}
 .org-header-alert .alert {
   margin-top: 10px;
 }
diff --git a/public/ng/less/gogs/issue.less b/public/ng/less/gogs/issue.less
index aaeb1af32..12cc59fc6 100644
--- a/public/ng/less/gogs/issue.less
+++ b/public/ng/less/gogs/issue.less
@@ -220,4 +220,34 @@ textarea#issue-add-content {
   box-sizing: border-box;
   height: 120px;
   resize: vertical;
+}
+// #issue list navigator
+#issue-list-nav {
+  li {
+    > a {
+      font-size: 13px;
+      font-weight: bold;
+      padding: .4em .9em;
+      border-radius: .3em;
+    }
+  }
+  li.current {
+    > a {
+      background-color: #0079bc;
+      color: #FAFAFA;
+      border-radius: .3em;
+    }
+  }
+  li.right {
+    margin-left: 4px;
+  }
+}
+// new issue button
+#issue-new {
+  > a {
+    padding: 0 !important;
+    button {
+      height: 34px;
+    }
+  }
 }
\ No newline at end of file
diff --git a/templates/repo/issue2/list.tmpl b/templates/repo/issue2/list.tmpl
index 9616199e1..d2440a3c5 100644
--- a/templates/repo/issue2/list.tmpl
+++ b/templates/repo/issue2/list.tmpl
@@ -2,5 +2,15 @@
 {{template "ng/base/header" .}}
 <div id="repo-wrapper">
     {{template "repo/header" .}}
+    <div class="issue-main container repo-wide-wrapper">
+        <ul id="issue-list-nav" class="menu menu-line">
+            <li class="current"><a href="#">Issue</a></li>
+            <li><a href="#">Pull Request</a></li>
+            <li><a href="#">Labels</a></li>
+            <li><a href="#">Milestones</a></li>
+            <li class="right" id="issue-new"><a href="#"><button id="issue-new-btn" class="btn btn-green btn-radius text-bold">New Issue</button></a></li>
+            <li class="right"><a href="#">Filter</a></li>
+        </ul>
+    </div>
 </div>
 {{template "ng/base/footer" .}}
\ No newline at end of file