diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 690e27d..5f8d22d 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -141,7 +141,7 @@
         </div>
       }
       </div>
-      <ul class="label-list">
+      <ul class="label-list nav nav-pills nav-stacked">
         @labellist(issueLabels)
       </ul>
     </div>
diff --git a/src/main/twirl/issues/labellist.scala.html b/src/main/twirl/issues/labellist.scala.html
index 204df29..fb3ab2f 100644
--- a/src/main/twirl/issues/labellist.scala.html
+++ b/src/main/twirl/issues/labellist.scala.html
@@ -1,4 +1,4 @@
 @(issueLabels: List[model.Label])
 @issueLabels.map { label =>
-  <li><span class="label" style="display: block; background-color: #@label.color; color: #@label.fontColor; margin-top: 2px; padding: 4px;">@label.labelName</span></li>
+  <li><span class="issue-label" style="background-color: #@label.color; color: #@label.fontColor;">@label.labelName</span></li>
 }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 2806a70..4d07337 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -449,6 +449,15 @@
   border-bottom: 4px solid #ddd;
 }
 
+.nav-pills > li > span.issue-label {
+  display: block;
+  padding: 0px 8px 2px 8px;
+  margin-top: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
 /****************************************************************************/
 /* Wiki */
 /****************************************************************************/