diff --git a/kallithea/templates/admin/settings/settings_system.html b/kallithea/templates/admin/settings/settings_system.html
--- a/kallithea/templates/admin/settings/settings_system.html
+++ b/kallithea/templates/admin/settings/settings_system.html
@@ -4,13 +4,13 @@
 
 <%
  elems = [
-    (_('Kallithea version'), h.literal('%s <b><span id="check_for_update" style="display:none">%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''),
+    (_('Kallithea version'), h.literal('%s <b><span id="check_for_update" style="display:none">%s</span></b>') % (c.kallithea_version, _('Check for updates')), ''),
     (_('Kallithea configuration file'), c.ini['__file__'], ''),
     (_('Python version'), c.py_version, ''),
     (_('Platform'), c.platform, ''),
     (_('Git version'), c.git_version, ''),
     (_('Git path'), c.ini.get('git_path'), ''),
-    (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''),
+    (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>') % (c.update_url, _('Note: please make sure this server can access this URL')), ''),
  ]
 %>
 <dl class="dl-horizontal">
diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html
--- a/kallithea/templates/data_table/_dt_elements.html
+++ b/kallithea/templates/data_table/_dt_elements.html
@@ -131,7 +131,7 @@
 <%def name="repo_group_name(repo_group_name, children_groups)">
   <div class="text-nowrap">
   <a href="${h.url('repos_group_home',group_name=repo_group_name)}">
-    <i class="icon-folder" title="${_('Repository group')}"></i>${h.literal(' &raquo; '.join(children_groups))}</a>
+    <i class="icon-folder" title="${_('Repository group')}"></i>${h.literal(' &raquo; ').join(children_groups)}</a>
   </div>
 </%def>
 
diff --git a/kallithea/templates/files/files_browser.html b/kallithea/templates/files/files_browser.html
--- a/kallithea/templates/files/files_browser.html
+++ b/kallithea/templates/files/files_browser.html
@@ -17,7 +17,7 @@
     %endif
 </%def>
 <%def name="_file_name(iconclass, name)">
-    <%return h.literal('<i class="%s"></i><span>%s</span>' % (iconclass, name))%>
+    <%return h.literal('<i class="%s"></i><span>%s</span>') % (iconclass, name)%>
 </%def>
 <%def name="file_name(node)">
     <%
@@ -27,7 +27,7 @@
         elif node.is_submodule():
             c = "icon-file-submodule"
     %>
-    <%return _file_name(c, h.escape(node.name))%>
+    <%return _file_name(c, node.name)%>
 </%def>
 <div id="body" class="panel panel-default">
     <div class="panel-heading clearfix">
diff --git a/kallithea/templates/files/files_history_box.html b/kallithea/templates/files/files_history_box.html
--- a/kallithea/templates/files/files_history_box.html
+++ b/kallithea/templates/files/files_history_box.html
@@ -1,5 +1,5 @@
 <div class="form-group">
-    <span>${h.HTML(ungettext(u'%s author',u'%s authors',len(c.authors))) % h.literal('<b>%s</b>' % len(c.authors)) }</span>
+    <span>${h.HTML(ungettext(u'%s author',u'%s authors',len(c.authors))) % (h.literal('<b>%s</b>') % len(c.authors)) }</span>
     %for email, user in c.authors:
       <span data-toggle="tooltip" title="${user}">
         ${h.gravatar_div(email, size=20)}