diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -45,11 +45,11 @@
     </td>
     <td class="td-hash">
     <code>
-      <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
 
       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
         <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span>
       </a>
+      <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
       % if hasattr(commit, 'phase'):
           % if commit.phase != 'public':
               <span class="tag phase-${commit.phase} tooltip" title="${_('Commit phase')}">${commit.phase}</span>
diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -35,8 +35,8 @@
           <span class="breadcrumbs files_location">
             <h4>${_('Commit')}
               <code>
+                ${h.show_id(c.commit)}
                 <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.commit.raw_id}" title="${_('Copy the full commit id')}"></i>
-                ${h.show_id(c.commit)}
                 % if hasattr(c.commit, 'phase'):
                       <span class="tag phase-${c.commit.phase} tooltip" title="${_('Commit phase')}">${c.commit.phase}</span>
                 % endif
diff --git a/rhodecode/templates/files/files_browser.mako b/rhodecode/templates/files/files_browser.mako
--- a/rhodecode/templates/files/files_browser.mako
+++ b/rhodecode/templates/files/files_browser.mako
@@ -6,11 +6,11 @@
             <div class="info_box">
               ${h.hidden('refs_filter')}
               <div class="info_box_elem previous">
-                    <a id="prev_commit_link" data-commit-id="${c.prev_commit.raw_id}" class="pjax-link ${'disabled' if c.url_prev == '#' else ''}" href="${c.url_prev}" title="${_('Previous commit')}"><i class="icon-chevron-left"></i></a>
+                    <a id="prev_commit_link" data-commit-id="${c.prev_commit.raw_id}" class="pjax-link ${'disabled' if c.url_prev == '#' else ''}" href="${c.url_prev}" title="${_('Previous commit')}"><i class="icon-left"></i></a>
               </div>
               <div class="info_box_elem">${h.text('at_rev',value=c.commit.revision)}</div>
               <div class="info_box_elem next">
-                    <a id="next_commit_link" data-commit-id="${c.next_commit.raw_id}" class="pjax-link ${'disabled' if c.url_next == '#' else ''}" href="${c.url_next}" title="${_('Next commit')}"><i class="icon-chevron-right"></i></a>
+                    <a id="next_commit_link" data-commit-id="${c.next_commit.raw_id}" class="pjax-link ${'disabled' if c.url_next == '#' else ''}" href="${c.url_next}" title="${_('Next commit')}"><i class="icon-right"></i></a>
               </div>
             </div>
             ${h.end_form()}
diff --git a/rhodecode/templates/files/files_browser_tree.mako b/rhodecode/templates/files/files_browser_tree.mako
--- a/rhodecode/templates/files/files_browser_tree.mako
+++ b/rhodecode/templates/files/files_browser_tree.mako
@@ -15,7 +15,7 @@
           <tr class="parity0">
             <td class="td-componentname">
               <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.file.parent.path)}" class="pjax-link">
-                <i class="icon-folder"></i>..
+                <i class="icon-directory"></i>..
               </a>
             </td>
             <td></td>
@@ -31,15 +31,15 @@
               <span class="submodule-dir">
                 % if node.url.startswith('http://') or node.url.startswith('https://'):
                   <a href="${node.url}">
-                      <i class="icon-folder browser-dir"></i>${node.name}
+                      <i class="icon-directory browser-dir"></i>${node.name}
                   </a>
                 % else:
-                  <i class="icon-folder browser-dir"></i>${node.name}
+                  <i class="icon-directory browser-dir"></i>${node.name}
                 % endif
               </span>
             % else:
               <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=h.safe_unicode(node.path))}" class="pjax-link">
-                <i class="${'icon-file browser-file' if node.is_file() else 'icon-folder browser-dir'}"></i>${node.name}
+                <i class="${'icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir'}"></i>${node.name}
               </a>
             % endif
             </td>
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,7 +3,12 @@
 <div id="codeblock" class="codeblock">
     <div class="codeblock-header">
       <div class="stats">
-            <span> <strong>${c.file}</strong></span>
+            <span>
+                <strong>
+                    <i class="icon-file-text"></i>
+                    ${c.file}
+                </strong>
+            </span>
             % 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
diff --git a/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako b/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
--- a/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
@@ -3,7 +3,7 @@
 
     % if c.pr_merge_possible:
         <h2 class="merge-status">
-            <span class="merge-icon success"><i class="icon-true"></i></span>
+            <span class="merge-icon success"><i class="icon-ok"></i></span>
             ${_('This pull request can be merged automatically.')}
         </h2>
     % else: