diff --git a/module/mr/css/common.css b/module/mr/css/common.css
index 488645d71d..cdf303bfa7 100644
--- a/module/mr/css/common.css
+++ b/module/mr/css/common.css
@@ -68,7 +68,7 @@ h3 {font-size: 16px;}
 /* Comment-btn */
 .comment-btn {position: relative; margin: 0; padding: 0; display: none;}
 .repoCode tr.over .comment-btn {display: block;}
-.comment-btn .icon-wrapper {display: block; position: absolute; background: #4183C4; border-radius: 2px; width: 24px; height: 20px; left: -6px; top: 0; line-height: 20px; text-align: center; color: #fff; cursor: pointer; transition: transform 0.2s;}
+.comment-btn .icon-wrapper {display: block; position: absolute; background: #4183C4; border-radius: 2px; width: 24px; height: 20px; left: -6px; top: -2px; line-height: 20px; text-align: center; color: #fff; cursor: pointer; transition: transform 0.2s;}
 .comment-btn .icon-wrapper:before {display: block; content: ' '; right: -4px; top: 6px; position: absolute; border-left: 4px solid #4183C4; border-right: 0 solid transparent; border-bottom: 4px solid transparent; border-top: 4px solid transparent; width: 0; height: 0;}
 .comment-btn .icon-wrapper:hover {background: #169; transform: scale(1.1);}
 .comment-btn .icon-wrapper:hover:before {border-left-color: #169;}
@@ -81,7 +81,7 @@ h3 {font-size: 16px;}
 .repoCode tr.commented .comment-btn .icon-wrapper > i:before {font-size: 18px; transform: scale(-1, 1); display: inline-block;}
 .repoCode tr.commented .comment-btn .icon-wrapper:before {display: none;}
 
-.repoCode tr.over.commented .comment-btn .icon-wrapper, .repoCode tr.selected.commented .comment-btn .icon-wrapper {line-height: 20px; height: 20px; background: #4183C4; color: #fff; left: -6px;}
+.repoCode tr.over.commented .comment-btn .icon-wrapper, .repoCode tr.selected.commented .comment-btn .icon-wrapper {line-height: 20px; height: 20px; background: #4183C4; color: #fff; left: -30px;}
 .repoCode tr.over.commented .comment-btn .icon-wrapper > i:before {font-size: 14px;}
 .repoCode tr.selected.commented .comment-btn .icon-wrapper > i:before {font-size: 14px;}
 .repoCode tr.over.commented .comment-btn .icon-wrapper:before, .repoCode tr.selected.commented .comment-btn .icon-wrapper:before {display: block;}
diff --git a/module/mr/css/diff.css b/module/mr/css/diff.css
index ae73402c63..d8bc183fa5 100644
--- a/module/mr/css/diff.css
+++ b/module/mr/css/diff.css
@@ -11,6 +11,7 @@ table.diff {margin-bottom: 0px;}
 .diff .line-all, .diff .line-all {background: #FFF;}
 .diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; background: #fafafa; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;}
 
+.repoCode .diff tr .comment-btn .icon-wrapper {left: -30px;}
 .repoCode .diff tr.over td.line-all, .repoCode .diff tr.over td.line-all {background: #f8eec7;}
 .repoCode .diff tr.over td.line-new, .repoCode .diff tr.over td.line-new {background: #8eff8e;}
 .repoCode .diff tr.over td.line-old, .repoCode .diff tr.over td.line-old {background: #f6b2b2;}
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index d511ae4094..a717e4e8b4 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -69,7 +69,7 @@ h3 {font-size: 16px;}
 /* Comment-btn */
 .comment-btn {position: relative; margin: 0; padding: 0; display: none;}
 .repoCode tr.over .comment-btn {display: block;}
-.comment-btn .icon-wrapper {display: block; position: absolute; background: #4183C4; border-radius: 2px; width: 24px; height: 20px; left: -6px; top: 0; line-height: 20px; text-align: center; color: #fff; cursor: pointer; transition: transform 0.2s;}
+.comment-btn .icon-wrapper {display: block; position: absolute; background: #4183C4; border-radius: 2px; width: 24px; height: 20px; left: -6px; top: -2; line-height: 20px; text-align: center; color: #fff; cursor: pointer; transition: transform 0.2s;}
 .comment-btn .icon-wrapper:before {display: block; content: ' '; right: -4px; top: 6px; position: absolute; border-left: 4px solid #4183C4; border-right: 0 solid transparent; border-bottom: 4px solid transparent; border-top: 4px solid transparent; width: 0; height: 0;}
 .comment-btn .icon-wrapper:hover {background: #169; transform: scale(1.1);}
 .comment-btn .icon-wrapper:hover:before {border-left-color: #169;}
@@ -83,7 +83,7 @@ h3 {font-size: 16px;}
 .repoCode tr.commented .comment-btn .icon-wrapper:before {display: none;}
 
 .repoCode tr.over.commented .comment-btn {margin-left: -20px; width: 25px; height:18px;}
-.repoCode tr.over.commented .comment-btn .icon-wrapper, .repoCode tr.selected.commented .comment-btn .icon-wrapper {line-height: 20px; height: 20px; background: #4183C4; color: #fff; left: -6px;}
+.repoCode tr.over.commented .comment-btn .icon-wrapper, .repoCode tr.selected.commented .comment-btn .icon-wrapper {line-height: 20px; height: 20px; background: #4183C4; color: #fff; left: -8px;}
 .repoCode tr.over.commented .comment-btn .icon-wrapper > i:before {font-size: 14px;}
 .repoCode tr.selected.commented .comment-btn .icon-wrapper > i:before {font-size: 14px;}
 .repoCode tr.over.commented .comment-btn .icon-wrapper:before, .repoCode tr.selected.commented .comment-btn .icon-wrapper:before {display: block;}
diff --git a/module/repo/css/diff.css b/module/repo/css/diff.css
index 6656308776..7124f55959 100644
--- a/module/repo/css/diff.css
+++ b/module/repo/css/diff.css
@@ -11,7 +11,7 @@ table.diff {margin-bottom: 0px;}
 .diff .line-all, .diff .line-all {background: #FFF;}
 .diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; background: #fafafa; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;}
 
-.repoCode .diff tr .comment-btn .icon-wrapper {left: -23px;}
+.repoCode .diff tr .comment-btn .icon-wrapper {left: -30px;}
 .repoCode .diff tr.over td.line-all, .repoCode .diff tr.over td.line-all {background: #f8eec7;}
 .repoCode .diff tr.over td.line-new, .repoCode .diff tr.over td.line-new {background: #8eff8e;}
 .repoCode .diff tr.over td.line-old, .repoCode .diff tr.over td.line-old {background: #f6b2b2;}
diff --git a/module/repo/css/view.css b/module/repo/css/view.css
index aaeba5de77..fff9103dcd 100644
--- a/module/repo/css/view.css
+++ b/module/repo/css/view.css
@@ -14,3 +14,4 @@ tr,th,td {border-bottom: none;}
 .body-modal .panel-actions {right: 30px;}
 .icon-angle-left {transform: rotateY(180deg);}
 #main {padding: 20px 0;}
+.m-repo-view .btn-toolbar .btn-link {margin-right: 0; padding-top: 8px;}
diff --git a/module/repo/js/browse.js b/module/repo/js/browse.js
index 198c971dc6..c08749e978 100644
--- a/module/repo/js/browse.js
+++ b/module/repo/js/browse.js
@@ -47,10 +47,13 @@ function getCloneHtml(cloneLang, url)
 
 $(function()
 {
-    $(document).on('click', 'main', function()
-    {
-        $('#downloadCode').popover('hide');
-    })
+    /* Hide popover tip. */
+    $(document).on('mousedown', function(e) {
+        var $target = $(e.target);
+        var $toggle = $target.closest('.popover, #downloadCode');
+        if(!$toggle.length) $('#downloadCode').popover('hide');
+    });
+
     /* Init popover. */
     var options = {
         container: 'body',
@@ -63,7 +66,7 @@ $(function()
     };
     $('#downloadCode').popover(options);
 
-    $('#downloadCode').click(function(e)
+    $('#downloadCode').click(function()
     {
         if($('.download-popover').css('display') == 'block')
         {
@@ -82,10 +85,8 @@ $(function()
 
             /* Set popover area. */
             var left = parseFloat($('.download-popover').css('left')) - 155;
-            $('.download-popover').css('left', left + 'px')
+            $('.download-popover').css('left', left + 'px');
         }
-
-        e.stopPropagation();
     })
 
     $('.copy-btn').live('click', function()