diff --git a/app/assets/stylesheets/_misc_legacy.sass b/app/assets/stylesheets/_misc_legacy.sass
index 63a6a83df7..a365d0caba 100644
--- a/app/assets/stylesheets/_misc_legacy.sass
+++ b/app/assets/stylesheets/_misc_legacy.sass
@@ -26,12 +26,13 @@
 // See doc/COPYRIGHT.rdoc for more details.
 //++
 
-/*
-  IMPORTANT!
 
-  This is a "junk-drawer" containing CSS rule sets that could not be easily
-  placed elsewhere. Pleade DO NOT add to this file. Instead MOVE, refactor or
-  REMOVE with ruthlessness.
+// IMPORTANT!
+
+// This is a "junk-drawer" containing CSS rule sets that could not be easily
+// placed elsewhere. Pleade DO NOT add to this file. Instead MOVE, refactor or
+// REMOVE with ruthlessness.
+
 
 #watchers
   ul
@@ -292,7 +293,7 @@ p.other-formats
 .other-formats span + span:before
   content: "| "
 
-/* Project members tab
+/* Project members tab */
 
 div#tab-content-members
   .user.status_registered, label.status_registered
@@ -424,7 +425,7 @@ ul.projects
   top: 7px
   right: 14px
 
-/* file table hovers
+/* file table hovers */
 
 a.has-thumb
   img
@@ -467,7 +468,7 @@ form#issue-list
   max-height: 200px
   overflow: hidden
 
-/* roadmap breathing
+/* roadmap breathing */
 
 #roadmap h3
   margin: 21px 0 12px
@@ -481,7 +482,7 @@ ul.projects div.root a.project
 div.issue div#relations
   margin-top: 25px
 
-/* all kinds of wonderful tweaks
+/* all kinds of wonderful tweaks*/
 
 .question pre
   color: #111
@@ -509,12 +510,12 @@ div.issue hr
 tr.time-entry
   white-space: normal
 
-/* comments
+/* comments */
 
 .wiki ol li
   list-style: decimal inside
 
-/* scm
+/* scm */
 
 #content table .changeset td.id a:hover
   text-decoration: underline
@@ -522,12 +523,12 @@ tr.time-entry
 #content table.files .opt-desc
   width: 45%
 
-/* member settings [pc]
+/* member settings [pc] */
 
 select#member_role_id
   width: 75px
 
-/* fix for thumbnail jankiness
+/* fix for thumbnail jankiness */
 
 a.has-thumb
   &.active
@@ -535,7 +536,7 @@ a.has-thumb
     margin-left: -10px
     margin-right: 0
     *left: -10px
-    /* IE6 & 7 hacks
+    /* IE6 & 7 hacks */
     *margin-left: 0
   img
     z-index: 1001
@@ -550,7 +551,7 @@ a.has-thumb
 
 
 /* Cut of text with '...' - working on all major browsers and IE6+
- * not working for Firefox < 7
+ * not working for Firefox < 7 */
 
 .ellipsis
   white-space: nowrap
@@ -627,7 +628,7 @@ strong.related-issues-heading
 div.indent
   padding-left: 10px
 
-/* Menu item configuration
+/* Menu item configuration */
 
 .menu-item-form
   p
@@ -669,12 +670,12 @@ div.indent
 .required
   color: #008BD0
 
-/*Gannt chart fix IE 6
+/*Gannt chart fix IE 6 */
 
 .task
   line-height: 1em
 
-/*Cost-Plugin specific styles
+/*Cost-Plugin specific styles */
 
 .icon-pieces
   background-image: image-url("webalys/units.png") !important
@@ -717,3 +718,14 @@ h4.comment
     color: #4B4B4B
     strong
       color: black
+
+/*
+ * Legacy headings to create headings which are similiar to the toolbar
+ * but cannot use the toolbar yet (e.g Legacy forms)
+ */
+.legacy-heading
+  // this will harmonize the headings in the old legacy form
+  // to be the same as if using a toolbar component
+  // TODO: once WP full screen create hits, remove this
+  padding-top: 12px
+  border: 0
diff --git a/app/assets/stylesheets/layout/_work_package.sass b/app/assets/stylesheets/layout/_work_package.sass
index 94fc964ac4..d149e05289 100644
--- a/app/assets/stylesheets/layout/_work_package.sass
+++ b/app/assets/stylesheets/layout/_work_package.sass
@@ -147,10 +147,3 @@
   #attributes
     .form--field-container
       max-width: 400px
-
-.work-package-legacy-heading
-  // this will harmonize the headings in the old legacy form
-  // to be the same as if using a toolbar component
-  // TODO: once WP full screen create hits, remove this
-  padding-top: 12px
-
diff --git a/app/views/wiki/annotate.html.erb b/app/views/wiki/annotate.html.erb
index f7b48fff2c..c85f9a7d95 100644
--- a/app/views/wiki/annotate.html.erb
+++ b/app/views/wiki/annotate.html.erb
@@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
               :accesskey => accesskey(:edit)) %>
   <%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %>
 <% end %>
-<h2><%= h(@page.pretty_title) %></h2>
+<h2 class='legacy-heading'><%= h(@page.pretty_title) %></h2>
 <%= render :partial => 'layouts/action_menu_specific' %>
 <p>
   <%= Version.model_name.human %> <%= link_to h(@annotate.content.version), :action => 'show', :id => @page, :version => @annotate.content.version %>
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index a5f249ad18..4b43c0b6f5 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -30,7 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <% content_for :action_menu_specific do %>
   <%= watcher_link(@wiki, User.current) %>
 <% end %>
-<h2><%= l(:label_index_by_date) %></h2>
+<h2 class="legacy-heading"><%= l(:label_index_by_date) %></h2>
 <%= render :partial => 'layouts/action_menu_specific' %>
 <% if @pages.empty? %>
   <p class="nodata"><%= l(:label_no_data) %></p>
diff --git a/app/views/wiki/destroy.html.erb b/app/views/wiki/destroy.html.erb
index 401f09baab..ea6a7e3380 100644
--- a/app/views/wiki/destroy.html.erb
+++ b/app/views/wiki/destroy.html.erb
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<h2><%=h @page.pretty_title %></h2>
+<%= toolbar title: "#{h(@page.pretty_title)}" %>
 <%= form_tag({}, :method => :delete) do %>
   <div class="box">
     <p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index bd4fbe5904..973359d209 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -30,7 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <% content_for :action_menu_specific do %>
   <%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %>
 <% end %>
-<h2><%= h(@page.pretty_title) %></h2>
+<h2 class="legacy-heading"><%= h(@page.pretty_title) %></h2>
 <%= render :partial => 'layouts/action_menu_specific' %>
 <p>
   <%= Version.model_name.human %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %>
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index 0a86c9e96c..58cf5b6845 100644
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<h2><%=h @page.pretty_title %></h2>
+<%= toolbar title: "#{h(@page.pretty_title)}" %>
 <%= labelled_tabular_form_for @content, :as => :content, :url => {:action => 'update', :id => @page}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
   <%= f.hidden_field :lock_version %>
   <%= error_messages_for 'content' %>
diff --git a/app/views/wiki/edit_parent_page.html.erb b/app/views/wiki/edit_parent_page.html.erb
index e3a57ff090..50c753f495 100644
--- a/app/views/wiki/edit_parent_page.html.erb
+++ b/app/views/wiki/edit_parent_page.html.erb
@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<h2><%= t(:button_change_parent_page) %>: <%= h(@page.title) %></h2>
+<%= toolbar title: "#{t(:button_change_parent_page)}: #{h(@page.title)}" %>
 
 <%= error_messages_for 'page' %>
 
diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
index 05814b3b79..71a53beae2 100644
--- a/app/views/wiki/history.html.erb
+++ b/app/views/wiki/history.html.erb
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<h2><%= h(@page.pretty_title) %></h2>
+<%= toolbar title: "#{h(@page.pretty_title)}" %>
 <h3><%= l(:label_history) %></h3>
 <%= form_tag({:action => "diff"}, :method => :get) do %>
   <table class="list wiki-page-versions">
diff --git a/app/views/wiki/index.html.erb b/app/views/wiki/index.html.erb
index cde25822c3..6e9fbc62a9 100644
--- a/app/views/wiki/index.html.erb
+++ b/app/views/wiki/index.html.erb
@@ -37,7 +37,7 @@ See doc/COPYRIGHT.rdoc for more details.
   <%= watcher_link(@wiki, User.current) %>
 <% end %>
 <% html_title l(:label_wiki_toc) %>
-<h2><%= l(:label_index_by_title) %></h2>
+<h2 class="legacy-heading"><%= l(:label_index_by_title) %></h2>
 <%= render :partial => 'layouts/action_menu_specific' %>
 <% if @pages.empty? %>
   <p class="nodata"><%= l(:label_no_data) %></p>
diff --git a/app/views/wiki/new.html.erb b/app/views/wiki/new.html.erb
index eb5a0358f3..f4223be123 100644
--- a/app/views/wiki/new.html.erb
+++ b/app/views/wiki/new.html.erb
@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<h2>
+<h2 class="legacy-heading">
   <% if @page.parent %>
     <% breadcrumb_for_page(@page.parent, l("create_new_page")) %>
     <%= l("create_child_page_for", :title => @page.parent.pretty_title) %>
diff --git a/app/views/wiki/rename.html.erb b/app/views/wiki/rename.html.erb
index 2d64630a17..e703c4e1e0 100644
--- a/app/views/wiki/rename.html.erb
+++ b/app/views/wiki/rename.html.erb
@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<h2><%= l(:button_rename) %>: <%= h(@original_title) %></h2>
+<%= toolbar title: "#{l(:button_rename)} #{h(@original_title)}" %>
 
 <%= error_messages_for 'page' %>
 
diff --git a/app/views/work_packages/show.html.erb b/app/views/work_packages/show.html.erb
index e42ef03234..75fa47607a 100644
--- a/app/views/work_packages/show.html.erb
+++ b/app/views/work_packages/show.html.erb
@@ -33,7 +33,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% work_package_breadcrumb %>
 
-<%= content_tag('h2', work_package.to_s, class: 'work-package-legacy-heading') %>
+<%= content_tag('h2', work_package.to_s, class: 'legacy-heading') %>
 
 <%= render :partial => 'layouts/action_menu_specific' %>