diff --git a/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html b/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
index 984a62f..86dd6fc 100644
--- a/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
@@ -11,8 +11,8 @@
     @if(comment.newLine.isDefined){newline="@comment.newLine.get"}
     @if(comment.oldLine.isDefined){oldline="@comment.oldLine.get"}>
   <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
-  <div class="box commit-comment-box commit-comment-@comment.commentId">
-    <div class="box-header">
+  <div class="panel- panel-default commit-comment-box commit-comment-@comment.commentId">
+    <div class="panel-heading">
       @user(comment.commentedUserName, styleClass="username strong")
         <span class="muted">
           commented
@@ -33,7 +33,7 @@
         }
       </span>
     </div>
-    <div class="box-content-bottom issue-content commit-commentContent-@comment.commentId markdown-body">
+    <div class="panel-body issue-content commit-commentContent-@comment.commentId markdown-body">
       @markdown(comment.content, repository, false, true, true, hasWritePermission)
     </div>
   </div>
diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
index 61c2637..fa656b4 100644
--- a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
@@ -8,8 +8,8 @@
 @import gitbucket.core.model.CommitComment
 @if(issue.isDefined){
   <div class="issue-avatar-image">@avatar(issue.get.openedUserName, 48)</div>
-  <div class="issue-comment-box">
-    <div class="box-header">
+  <div class="panel panel-default issue-comment-box">
+    <div class="panel-heading">
       @user(issue.get.openedUserName, styleClass="username strong") <span class="muted">commented @helper.html.datetimeago(issue.get.registeredDate)</span>
       <span class="pull-right">
         @if(hasWritePermission || loginAccount.map(_.userName == issue.get.openedUserName).getOrElse(false)){
@@ -17,7 +17,7 @@
         }
       </span>
     </div>
-    <div class="box-content-bottom issue-content markdown-body" id="issueContent">
+    <div class="panel-body issue-content markdown-body" id="issueContent">
       @markdown(issue.get.content getOrElse "No description provided.", repository, false, true, true, hasWritePermission)
     </div>
   </div>
diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html
index e676b2b..0cace96 100644
--- a/src/main/twirl/gitbucket/core/issues/create.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -11,8 +11,8 @@
       <div class="row">
         <div class="col-md-10">
           <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
-          <div class="box issue-box">
-            <div class="box-content">
+          <div class="panel panel-default issue-box">
+            <div class="panel-body">
               <span id="error-title" class="error"></span>
               <input type="text" name="title" class="form-control" value="" placeholder="Title" style="width: 680px;" autofocus/>
               @helper.html.preview(
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index 9d3cbe7..8a58998 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -110,31 +110,29 @@
       @repository.repository.description.map { description =>
         <p class="description">@detectAndRenderLinks(description)</p>
       }
-      <div style="margin-bottom: 10px;" class="panel panel-default">
-        <div class="panel-body">
-          <table class="fill-width">
-            <tr>
-              <td style="width: 33%; text-align: center;">
-                <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(""))" class="header-link">
-                  <i class="octicon octicon-history"></i>
-                  <strong>@repository.commitCount</strong> commits
-                </a>
-              </td>
-              <td style="width: 33%; text-align: center;">
-                <a href="@url(repository)/branches" class="header-link" class="header-link">
-                  <i class="octicon octicon-git-branch"></i>
-                  <strong>@repository.branchList.length</strong> branches
-                </a>
-              </td>
-              <td style="width: 33%; text-align: center;">
-                <a href="@url(repository)/tags" class="header-link" class="header-link">
-                  <i class="octicon octicon-tag"></i>
-                  <strong>@repository.tags.length</strong> releases
-                </a>
-              </td>
-            </tr>
-          </table>
-        </div>
+      <div style="margin-bottom: 10px; padding: 4px;" class="panel panel-default">
+        <table class="fill-width">
+          <tr>
+            <td style="width: 33%; text-align: center;">
+              <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(""))" class="header-link">
+                <i class="octicon octicon-history"></i>
+                <strong>@repository.commitCount</strong> commits
+              </a>
+            </td>
+            <td style="width: 33%; text-align: center;">
+              <a href="@url(repository)/branches" class="header-link" class="header-link">
+                <i class="octicon octicon-git-branch"></i>
+                <strong>@repository.branchList.length</strong> branches
+              </a>
+            </td>
+            <td style="width: 33%; text-align: center;">
+              <a href="@url(repository)/tags" class="header-link" class="header-link">
+                <i class="octicon octicon-tag"></i>
+                <strong>@repository.tags.length</strong> releases
+              </a>
+            </td>
+          </tr>
+        </table>
       </div>
     }
     @body
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index a87044e..379a89c 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -56,8 +56,8 @@
           <div class="row">
             <div class="col-md-10">
               <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
-              <div class="box issue-box">
-                <div class="box-content">
+              <div class="panel panel-default issue-box">
+                <div class="panel-body">
                   <span class="error" id="error-title"></span>
                   <input type="text" name="title" class="form-control" style="width: 680px" placeholder="Title"/>
                   @helper.html.preview(
@@ -99,7 +99,7 @@
         </tr>
       </table>
     } else {
-      <div style="margin-bottom: 10px;" class="box-content">
+      <div style="margin-bottom: 10px; padding: 4px;" class="panel panel-default">
         <table class="fill-width">
           <tr>
             <td style="width: 25%; text-align: center;">
diff --git a/src/main/twirl/gitbucket/core/repo/commentform.scala.html b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
index d5e6403..72ca0a4 100644
--- a/src/main/twirl/gitbucket/core/repo/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
@@ -13,8 +13,8 @@
     @if(!fileName.isDefined){
       <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
     }
-    <div class="box issue-comment-box">
-      <div class="box-content">
+    <div class="panel panel-default issue-comment-box">
+      <div class="panel-body">
         @helper.html.preview(
           repository         = repository,
           content            = "",
diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
index e10309b..caad4b1 100644
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -125,9 +125,9 @@
       }
     </table>
     @readme.map { case(filePath, content) =>
-      <div id="readme">
-        <div class="box-header">@filePath.reverse.head</div>
-        <div class="box-content-bottom markdown-body" style="padding-left: 20px; padding-right: 20px;">@renderMarkup(filePath, content, branch, repository, false, false, true)</div>
+      <div id="readme" class="panel panel-default">
+        <div class="panel-heading">@filePath.reverse.head</div>
+        <div class="panel-body markdown-body" style="padding-left: 20px; padding-right: 20px;">@renderMarkup(filePath, content, branch, repository, false, false, true)</div>
       </div>
     }
   }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 9621ed0..04dbfe8 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1214,6 +1214,10 @@
   /*padding: 8px;*/
 }
 
+div.issue-box > div.panel-body {
+  padding: 4px;
+}
+
 div.issue-comment-box > div.panel-body,
 div.commit-comment-box > div.panel-body {
   padding: 8px;