diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html
--- a/rhodecode/templates/files/files.html
+++ b/rhodecode/templates/files/files.html
@@ -1,13 +1,17 @@
 <%inherit file="/base/base.html"/>
 
-<%def name="title()">
-    ${_('%s files') % c.repo_name} - ${c.rhodecode_name}
+<%def name="title(*args)">
+    ${_('%s Files') % c.repo_name}
+    %if hasattr(c,'file'):
+        &middot; ${c.file.path or '\\'}
+    %endif
+    &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Files')}
     %if c.file:
-        @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
+        @ ${h.show_id(c.changeset)}
     %endif
 </%def>
 
@@ -65,10 +69,11 @@ var ypjax_links = function(){
         }
 
         var parts2 = parts[1].split('/');
-          var rev = parts2.shift(); // pop the first element which is the revision
-          var f_path = parts2.join('/');
+        var rev = parts2.shift(); // pop the first element which is the revision
+        var f_path = parts2.join('/');
 
-        var title = "${_('%s files') % c.repo_name}" + " - " + f_path;
+        //page title make this consistent with title() mako function on top
+        var title = "${_('%s Files') % c.repo_name}" + " &middot; " + (f_path || '\\') + " &middot; " + "${c.rhodecode_name}";
 
         var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path);
         var _url_base = url_base.replace('__REV__',rev);