diff --git a/module/repo/css/diff.css b/module/repo/css/diff.css
index 7306ab9edf..ac7b0f433c 100644
--- a/module/repo/css/diff.css
+++ b/module/repo/css/diff.css
@@ -32,3 +32,8 @@ table.diff {margin-bottom: 0px;}
 #fileTabs .tab-nav-item {max-width: none !important;}
 #filesTree #modules {margin-top: 5px;}
 #filesTree {overflow-y: auto;}
+
+.file-tree {padding: 0;}
+#sidebar > .sidebar-toggle {left: auto; right: 3px;}
+#sidebar > .sidebar-toggle > .icon {left : -1px;}
+.hide-sidebar #sidebar {width: 0 !important;}
diff --git a/module/repo/js/diff.js b/module/repo/js/diff.js
index 4938b3df51..a3b19bcd9e 100644
--- a/module/repo/js/diff.js
+++ b/module/repo/js/diff.js
@@ -117,7 +117,7 @@ $(document).ready(function()
         var paneHeight = $(window).height() - 120;
         if(isonlybody) paneHeight = 500;
         $('#fileTabs .tab-pane').css('height', paneHeight + 'px')
-        $('#filesTree').css('height', paneHeight + 45)
+        $('#filesTree').css('height', paneHeight + 35)
     }
     setHeight();
 
diff --git a/module/repo/view/diffeditor.html.php b/module/repo/view/diffeditor.html.php
index f81bea3883..1b147d8f64 100644
--- a/module/repo/view/diffeditor.html.php
+++ b/module/repo/view/diffeditor.html.php
@@ -13,16 +13,17 @@ js::set('openedFiles', array($entry));
 js::set('urlParams', "repoID=$repoID&objectID=$objectID&entry=%s&oldRevision=$oldRevision&newRevision=$newRevision&showBug=$showBug&encoding=$encoding");
 ?>
 <?php if(!isonlybody()):?>
-<div id="mainContent" class="main-row fade">
+<div id="mainContent" class="main-row fade diff-page">
   <?php $sideWidth = common::checkNotCN() ? '270' : '240';?>
-  <div class="side-col" style="width: <?php echo $sideWidth;?>px; padding-top: <?php echo isonlybody() ? 22 : 0;?>px;">
-    <div class="side-col file-tree" style="width: <?php echo $sideWidth;?>px;" data-min-width="<?php echo $sideWidth;?>">
+  <div class="side-col" id='sidebar' style="width: <?php echo $sideWidth + 15;?>px; padding-top: <?php echo isonlybody() ? 22 : 0;?>px;">
+    <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
+    <div class="cell file-tree" style="width: <?php echo $sideWidth;?>px;" data-min-width="<?php echo $sideWidth;?>">
       <div id="filesTree" class="cell load-indicator <?php if(isonlybody()) echo 'pull-left';?>">
         <?php echo $this->repo->getFileTree($repo, '', $diffs);?>
       </div>
     </div>
   </div>
-<?php endif;?>
+  <?php endif;?>
   <div class="main-col repoCode main">
     <div class="content panel">
       <div class='btn-toolbar'>