diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb
index 25716ff9e..4b1d3767e 100644
--- a/app/views/admin/plugins.html.erb
+++ b/app/views/admin/plugins.html.erb
@@ -1,4 +1,4 @@
-<h2><%= l(:label_plugins) %></h2>
+<%= title l(:label_plugins) %>
 
 <% if @plugins.any? %>
 <table class="list plugins">
diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb
index 00c13d581..b7b198973 100644
--- a/app/views/admin/projects.html.erb
+++ b/app/views/admin/projects.html.erb
@@ -2,7 +2,7 @@
 <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
-<h2><%=l(:label_project_plural)%></h2>
+<%= title l(:label_project_plural) %>
 
 <%= form_tag({}, :method => :get) do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
@@ -41,5 +41,3 @@
   </tbody>
 </table>
 </div>
-
-<% html_title(l(:label_project_plural)) -%>
diff --git a/app/views/auth_sources/edit.html.erb b/app/views/auth_sources/edit.html.erb
index aee3baf56..7f3d07e08 100644
--- a/app/views/auth_sources/edit.html.erb
+++ b/app/views/auth_sources/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_auth_source)%> (<%= h(@auth_source.auth_method_name) %>)</h2>
+<%= title [l(:label_auth_source_plural), auth_sources_path], @auth_source.name %>
 
 <%= labelled_form_for @auth_source, :as => :auth_source, :url => auth_source_path(@auth_source), :html => {:id => 'auth_source_form'} do |f| %>
   <%= render :partial => auth_source_partial_name(@auth_source), :locals => { :f => f } %>
diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb
index 3d7fa8ff6..975146180 100644
--- a/app/views/auth_sources/index.html.erb
+++ b/app/views/auth_sources/index.html.erb
@@ -2,7 +2,7 @@
 <%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
-<h2><%=l(:label_auth_source_plural)%></h2>
+<%= title l(:label_auth_source_plural) %>
 
 <table class="list">
   <thead><tr>
diff --git a/app/views/auth_sources/new.html.erb b/app/views/auth_sources/new.html.erb
index d6d6bc5b3..e9307faaf 100644
--- a/app/views/auth_sources/new.html.erb
+++ b/app/views/auth_sources/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_auth_source_new)%> (<%= h(@auth_source.auth_method_name) %>)</h2>
+<%= title [l(:label_auth_source_plural), auth_sources_path], "#{l(:label_auth_source_new)} (#{@auth_source.auth_method_name})" %>
 
 <%= labelled_form_for @auth_source, :as => :auth_source, :url => auth_sources_path, :html => {:id => 'auth_source_form'} do |f| %>
   <%= hidden_field_tag 'type', @auth_source.type %>
diff --git a/app/views/custom_fields/edit.html.erb b/app/views/custom_fields/edit.html.erb
index 43a8ebf30..803ba0558 100644
--- a/app/views/custom_fields/edit.html.erb
+++ b/app/views/custom_fields/edit.html.erb
@@ -1,6 +1,6 @@
-<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
-  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
-  &#187; <%=h @custom_field.name %></h2>
+<%= title [l(:label_custom_field_plural), custom_fields_path],
+  [l(@custom_field.type_name), custom_fields_path(:tab => @custom_field.class.name)],
+  @custom_field.name %>
 
 <%= labelled_form_for :custom_field, @custom_field, :url => custom_field_path(@custom_field), :html => {:method => :put, :id => 'custom_field_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/custom_fields/index.html.erb b/app/views/custom_fields/index.html.erb
index 7b29e25e7..b4e87f066 100644
--- a/app/views/custom_fields/index.html.erb
+++ b/app/views/custom_fields/index.html.erb
@@ -1,5 +1,3 @@
-<h2><%=l(:label_custom_field_plural)%></h2>
+<%= title l(:label_custom_field_plural) %>
 
 <%= render_tabs custom_fields_tabs %>
-
-<% html_title(l(:label_custom_field_plural)) -%>
diff --git a/app/views/custom_fields/new.html.erb b/app/views/custom_fields/new.html.erb
index 71e7197ec..7af7735f0 100644
--- a/app/views/custom_fields/new.html.erb
+++ b/app/views/custom_fields/new.html.erb
@@ -1,6 +1,6 @@
-<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
-  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
-  &#187; <%= l(:label_custom_field_new) %></h2>
+<%= title [l(:label_custom_field_plural), custom_fields_path],
+  [l(@custom_field.type_name), custom_fields_path(:tab => @custom_field.class.name)],
+  l(:label_custom_field_new) %>
 
 <%= labelled_form_for :custom_field, @custom_field, :url => custom_fields_path, :html => {:id => 'custom_field_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/enumerations/destroy.html.erb b/app/views/enumerations/destroy.html.erb
index b469d4f9b..503cf4cca 100644
--- a/app/views/enumerations/destroy.html.erb
+++ b/app/views/enumerations/destroy.html.erb
@@ -1,4 +1,4 @@
-<h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
+<%= title [l(@enumeration.option_name), enumerations_path], @enumeration.name %>
 
 <%= form_tag({}, :method => :delete) do %>
 <div class="box">
diff --git a/app/views/enumerations/edit.html.erb b/app/views/enumerations/edit.html.erb
index e5c523390..59a7aa6ba 100644
--- a/app/views/enumerations/edit.html.erb
+++ b/app/views/enumerations/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=h @enumeration %></h2>
+<%= title [l(@enumeration.option_name), enumerations_path], @enumeration.name %>
 
 <%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
diff --git a/app/views/enumerations/new.html.erb b/app/views/enumerations/new.html.erb
index dfbd99f52..1714e8e89 100644
--- a/app/views/enumerations/new.html.erb
+++ b/app/views/enumerations/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=l(:label_enumeration_new)%></h2>
+<%= title [l(@enumeration.option_name), enumerations_path], l(:label_enumeration_new) %>
 
 <%= labelled_form_for :enumeration, @enumeration, :url => enumerations_path do |f| %>
   <%= f.hidden_field :type  %>
diff --git a/app/views/issue_statuses/edit.html.erb b/app/views/issue_statuses/edit.html.erb
index d52d61bd2..425ab43d9 100644
--- a/app/views/issue_statuses/edit.html.erb
+++ b/app/views/issue_statuses/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=h @issue_status %></h2>
+<%= title [l(:label_issue_status_plural), issue_statuses_path], @issue_status.name %>
 
 <%= labelled_form_for @issue_status do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
diff --git a/app/views/issue_statuses/new.html.erb b/app/views/issue_statuses/new.html.erb
index c9e60abcd..86f2131b2 100644
--- a/app/views/issue_statuses/new.html.erb
+++ b/app/views/issue_statuses/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=l(:label_issue_status_new)%></h2>
+<%= title [l(:label_issue_status_plural), issue_statuses_path], l(:label_issue_status_new) %>
 
 <%= labelled_form_for @issue_status do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 45a258249..feb9e792f 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_issue_new)%></h2>
+<%= title l(:label_issue_new) %>
 
 <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
 
diff --git a/app/views/projects/destroy.html.erb b/app/views/projects/destroy.html.erb
index d5762e08d..ac392b72c 100644
--- a/app/views/projects/destroy.html.erb
+++ b/app/views/projects/destroy.html.erb
@@ -1,4 +1,5 @@
-<h2><%=l(:label_confirmation)%></h2>
+<%= title l(:label_confirmation) %>
+
 <div class="warning">
 <p><strong><%=h @project_to_destroy %></strong><br />
 <%=l(:text_project_destroy_confirmation)%>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 58d8192ce..a14a9cf3e 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_project_new)%></h2>
+<%= title l(:label_project_new) %>
 
 <%= labelled_form_for @project do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/roles/edit.html.erb b/app/views/roles/edit.html.erb
index 7caca3002..dc52202b5 100644
--- a/app/views/roles/edit.html.erb
+++ b/app/views/roles/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=h @role.name %></h2>
+<%= title [l(:label_role_plural), roles_path], @role.name %>
 
 <%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/roles/new.html.erb b/app/views/roles/new.html.erb
index 0e5dfeb9c..752992cfa 100644
--- a/app/views/roles/new.html.erb
+++ b/app/views/roles/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_role_new)%></h2>
+<%= title [l(:label_role_plural), roles_path], l(:label_role_new) %>
 
 <%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index af78715e0..bf745a66a 100644
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_permissions_report)%></h2>
+<%= title [l(:label_role_plural), roles_path], l(:label_permissions_report) %>
 
 <%= form_tag(permissions_roles_path, :id => 'permissions_form') do %>
 <%= hidden_field_tag 'permissions[0]', '', :id => nil %>
diff --git a/app/views/settings/plugin.html.erb b/app/views/settings/plugin.html.erb
index 367f5920c..0d5b837d3 100644
--- a/app/views/settings/plugin.html.erb
+++ b/app/views/settings/plugin.html.erb
@@ -1,4 +1,4 @@
-<h2><%= l(:label_settings) %>: <%=h @plugin.name %></h2>
+<%= title [l(:label_plugins), {:controller => 'admin', :action => 'plugins'}], @plugin.name %>
 
 <div id="settings">
 <%= form_tag({:action => 'plugin'}) do %>
diff --git a/app/views/trackers/edit.html.erb b/app/views/trackers/edit.html.erb
index 76744c403..857c6ac22 100644
--- a/app/views/trackers/edit.html.erb
+++ b/app/views/trackers/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=h @tracker %></h2>
+<%= title [l(:label_tracker_plural), trackers_path], @tracker.name %>
 
 <%= labelled_form_for @tracker do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb
index ef8959147..d3e31fe45 100644
--- a/app/views/trackers/fields.html.erb
+++ b/app/views/trackers/fields.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%= l(:field_summary) %></h2>
+<%= title [l(:label_tracker_plural), trackers_path], l(:field_summary) %>
 
 <% if @trackers.any? %>
   <%= form_tag fields_trackers_path do %>
@@ -73,5 +73,3 @@
 <% else %>
   <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
-
-<% html_title l(:field_summary) %>
diff --git a/app/views/trackers/new.html.erb b/app/views/trackers/new.html.erb
index 7bd8c6a00..4fe1efec8 100644
--- a/app/views/trackers/new.html.erb
+++ b/app/views/trackers/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=l(:label_tracker_new)%></h2>
+<%= title [l(:label_tracker_plural), trackers_path], l(:label_tracker_new) %>
 
 <%= labelled_form_for @tracker do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index fa4f38a64..d46521730 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -4,8 +4,6 @@
 <%= delete_link user_path(@user) if User.current != @user %>
 </div>
 
-<h2><%= link_to l(:label_user_plural), users_path %> &#187; <%=h @user.login %></h2>
+<%= title [l(:label_user_plural), users_path], @user.login %>
 
 <%= render_tabs user_settings_tabs %>
-
-<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 4eca39d07..255788e02 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_user_plural), users_path %> &#187; <%=l(:label_user_new)%></h2>
+<%= title [l(:label_user_plural), users_path], l(:label_user_new) %>
 
 <%= labelled_form_for @user do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/workflows/copy.html.erb b/app/views/workflows/copy.html.erb
index 62334c962..78997caf5 100644
--- a/app/views/workflows/copy.html.erb
+++ b/app/views/workflows/copy.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_workflow), workflows_edit_path %> &#187; <%=l(:button_copy)%></h2>
+<%= title [l(:label_workflow), workflows_edit_path], l(:button_copy) %>
 
 <%= form_tag({}, :id => 'workflow_copy_form') do %>
 <fieldset class="tabular box">
diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb
index a7f2dae62..8c02653c5 100644
--- a/app/views/workflows/edit.html.erb
+++ b/app/views/workflows/edit.html.erb
@@ -1,6 +1,6 @@
 <%= render :partial => 'action_menu' %>
 
-<h2><%=l(:label_workflow)%></h2>
+<%= title l(:label_workflow) %>
 
 <div class="tabs">
   <ul>
@@ -54,5 +54,3 @@
     <%= submit_tag l(:button_save) %>
   <% end %>
 <% end %>
-
-<% html_title(l(:label_workflow)) -%>
diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb
index 9ddb71b10..8e87dfd6b 100644
--- a/app/views/workflows/index.html.erb
+++ b/app/views/workflows/index.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_workflow), workflows_edit_path %> &#187; <%=l(:field_summary)%></h2>
+<%= title [l(:label_workflow), workflows_edit_path], l(:field_summary) %>
 
 <% if @workflow_counts.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>
diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb
index 6046201d3..89c3ceef9 100644
--- a/app/views/workflows/permissions.html.erb
+++ b/app/views/workflows/permissions.html.erb
@@ -1,6 +1,6 @@
 <%= render :partial => 'action_menu' %>
 
-<h2><%=l(:label_workflow)%></h2>
+<%= title l(:label_workflow) %>
 
 <div class="tabs">
   <ul>