diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less
--- a/rhodecode/public/css/code-block.less
+++ b/rhodecode/public/css/code-block.less
@@ -408,8 +408,8 @@ div.codeblock {
 
     overflow: auto;
     padding: 0px;
-    border: @border-thickness solid @grey5;
-    background: @grey6;
+    border: @border-thickness solid #EAEAEA;
+    background: #f5f5f5;
     .border-radius(@border-radius);
 
     #remove_gist {
@@ -493,6 +493,10 @@ div.codeblock {
             width: 100%;
         }
     }
+
+    .codeblock-header {
+        border-bottom: 1px solid #eaeaea;
+    }
 }
 
 .code-highlighttable,
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -516,7 +516,7 @@ ul.auth_plugins {
 	text-align: center;
 	vertical-align: middle;
 	color: @grey2;
-	background-color: @grey6;
+    font-size: 11px;
 
 	p {
 		margin: 0;
diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less
--- a/rhodecode/public/css/summary.less
+++ b/rhodecode/public/css/summary.less
@@ -228,6 +228,23 @@
         }
     }
 
+    .left-label-summary-files {
+        padding-left: 45px;
+        margin-top: 5px;
+
+        p {
+            margin-bottom: 5px;
+            color: @grey1;
+            float: left;
+            width: 130px;
+        }
+
+        .right-label-summary {
+            float: left;
+            margin-top: 7px;
+        }
+    }
+
     .left-content {
         width: ~"calc(60% - 20px)";
         float: left;
@@ -386,11 +403,10 @@
     display: block;
     width: 100%;
     margin: 0;
-    padding: @space 0 10px 0;
-    border-top: @border-thickness solid @border-default-color;
 
     .stats {
         float: left;
+        padding: 10px;
     }
     .stats-filename {
         font-size: 120%;
@@ -399,10 +415,17 @@
         padding: 0px 0px 0px 3px;
     }
 
+    .stats-info {
+        margin-top: 5px;
+        color: @grey4;
+    }
+
     .buttons {
         float: right;
         text-align: right;
         color: @grey4;
+        padding: 10px;
+        margin-top: 15px;
     }
 
     .file-container {
diff --git a/rhodecode/templates/files/files_source.mako b/rhodecode/templates/files/files_source.mako
--- a/rhodecode/templates/files/files_source.mako
+++ b/rhodecode/templates/files/files_source.mako
@@ -3,24 +3,25 @@
 <div id="codeblock" class="codeblock">
     <div class="codeblock-header">
       <div class="stats">
-            <span class="stats-filename">
-                <strong>
-                    <i class="icon-file-text"></i>
-                    ${c.file.unicode_path_safe}
-                </strong>
-            </span>
-            <span class="item last"><i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.f_path}" title="${_('Copy the full path')}"></i></span>
-            <br/>
+        <span class="stats-filename">
+            <strong>
+                <i class="icon-file-text"></i>
+                ${c.file.unicode_path_safe}
+            </strong>
+        </span>
+        <span class="item last"><i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.f_path}" title="${_('Copy the full path')}"></i></span>
+        <br/>
 
-            % if c.lf_node:
-            <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
-            % endif
+        % if c.lf_node:
+        <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
+        % endif
 
-            <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
-            <span> | ${h.format_byte_size_binary(c.file.size)}</span>
-            <span> | ${c.file.mimetype} </span>
-            <span> | ${h.get_lexer_for_filenode(c.file).__class__.__name__}</span>
-
+        <div class="stats-info">
+          <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
+          <span> | ${h.format_byte_size_binary(c.file.size)}</span>
+          <span> | ${c.file.mimetype} </span>
+          <span> | ${h.get_lexer_for_filenode(c.file).__class__.__name__}</span>
+        </div>
       </div>
       <div class="buttons">
         <a id="file_history_overview" href="#">
diff --git a/rhodecode/templates/files/files_source_header.mako b/rhodecode/templates/files/files_source_header.mako
--- a/rhodecode/templates/files/files_source_header.mako
+++ b/rhodecode/templates/files/files_source_header.mako
@@ -27,10 +27,10 @@
       </div>
 
       <div class="fieldset collapsable-content" data-toggle="summary-details">
-        <div class="">
-          <div class="tags">
-            ${_('File last commit')}
-            <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
+        <div class="left-label-summary-files">
+            <p>${_('File last commit')}</p>
+            <div class="right-label-summary">
+              <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
 
             ${file_base.refs(c.file_last_commit)}
           </div>
@@ -39,22 +39,24 @@
 
 
       <div class="fieldset collapsable-content" data-toggle="summary-details">
-        <div class="">
-        ${_('Show/Diff file')}
-        ${h.hidden('diff1')}
-        ${h.hidden('diff2',c.commit.raw_id)}
-        ${h.hidden('annotate', c.annotate)}
+        <div class="left-label-summary-files">
+          <p>${_('Show/Diff file')}</p>
+          <div class="right-label-summary">
+            ${h.hidden('diff1')}
+            ${h.hidden('diff2',c.commit.raw_id)}
+            ${h.hidden('annotate', c.annotate)}
+          </div>
         </div>
       </div>
 
 
       <div class="fieldset collapsable-content" data-toggle="summary-details">
-        <div class="">
-          ${_('Action')}:
-        </div>
-        <div class="">
-        ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
-        ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
+        <div class="left-label-summary-files">
+          <p>${_('Action')}</p>
+          <div class="right-label-summary">
+            ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
+            ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
+          </div>
         </div>
       </div>
     </div>