diff --git a/app/views/auth_sources/edit.html.erb b/app/views/auth_sources/edit.html.erb
old mode 100644
new mode 100755
index 7f3d07e..2e2c4d5
--- a/app/views/auth_sources/edit.html.erb
+++ b/app/views/auth_sources/edit.html.erb
@@ -3,4 +3,5 @@
 <%= 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 } %>
   <%= submit_tag l(:button_save) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/auth_sources/new.html.erb b/app/views/auth_sources/new.html.erb
old mode 100644
new mode 100755
index e9307fa..0fbba56
--- a/app/views/auth_sources/new.html.erb
+++ b/app/views/auth_sources/new.html.erb
@@ -4,4 +4,5 @@
   <%= hidden_field_tag 'type', @auth_source.type %>
   <%= render :partial => auth_source_partial_name(@auth_source), :locals => { :f => f } %>
   <%= submit_tag l(:button_create) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
old mode 100644
new mode 100755
diff --git a/app/views/custom_fields/select_type.html.erb b/app/views/custom_fields/select_type.html.erb
old mode 100644
new mode 100755
index 084c9f3..d893b3e
--- a/app/views/custom_fields/select_type.html.erb
+++ b/app/views/custom_fields/select_type.html.erb
@@ -10,5 +10,8 @@
   <% end %>
   </p>
   </div>
-  <p><%= submit_tag l(:label_next).html_safe + " &#187;".html_safe, :name => nil %></p>
+  <p>
+    <%= submit_tag l(:label_next).html_safe + " &#187;".html_safe, :name => nil %>
+    <%= link_to l(:button_cancel), url_for(:back) %>
+  </p>
 <% end %>
diff --git a/app/views/documents/new.html.erb b/app/views/documents/new.html.erb
old mode 100644
new mode 100755
index a34391e..1969884
--- a/app/views/documents/new.html.erb
+++ b/app/views/documents/new.html.erb
@@ -2,5 +2,8 @@
 
 <%= labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
-  <p><%= submit_tag l(:button_create) %></p>
+  <p>
+    <%= submit_tag l(:button_create) %>
+    <%= link_to l(:button_cancel), url_for(:back) %>
+  </p>
 <% end %>
diff --git a/app/views/enumerations/edit.html.erb b/app/views/enumerations/edit.html.erb
old mode 100644
new mode 100755
index a7d03ce..5b77702
--- a/app/views/enumerations/edit.html.erb
+++ b/app/views/enumerations/edit.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put, :multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/enumerations/new.html.erb b/app/views/enumerations/new.html.erb
old mode 100644
new mode 100755
index dcd9a49..ccbbdf2
--- a/app/views/enumerations/new.html.erb
+++ b/app/views/enumerations/new.html.erb
@@ -4,4 +4,5 @@
   <%= f.hidden_field :type  %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/files/new.html.erb b/app/views/files/new.html.erb
old mode 100644
new mode 100755
index ab38b44..18f2264
--- a/app/views/files/new.html.erb
+++ b/app/views/files/new.html.erb
@@ -13,4 +13,5 @@
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>
 <%= submit_tag l(:button_add) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/groups/_general.html.erb b/app/views/groups/_general.html.erb
old mode 100644
new mode 100755
index 9cc5be6..a815435
--- a/app/views/groups/_general.html.erb
+++ b/app/views/groups/_general.html.erb
@@ -1,4 +1,5 @@
 <%= labelled_form_for @group, :url => group_path(@group), :html => {:multipart => true} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/groups/new.html.erb b/app/views/groups/new.html.erb
old mode 100644
new mode 100755
index c643161..4f45791
--- a/app/views/groups/new.html.erb
+++ b/app/views/groups/new.html.erb
@@ -5,5 +5,6 @@
 <p>
   <%= f.submit l(:button_create) %>
   <%= f.submit l(:button_create_and_continue), :name => 'continue' %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 </p>
 <% end %>
diff --git a/app/views/issue_categories/edit.html.erb b/app/views/issue_categories/edit.html.erb
old mode 100644
new mode 100755
index c04aacb..0611be4
--- a/app/views/issue_categories/edit.html.erb
+++ b/app/views/issue_categories/edit.html.erb
@@ -4,4 +4,5 @@
                      :url => issue_category_path(@category), :html => {:method => :put} do |f| %>
 <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/issue_categories/new.html.erb b/app/views/issue_categories/new.html.erb
old mode 100644
new mode 100755
index b8ecf89..bd1b9aa
--- a/app/views/issue_categories/new.html.erb
+++ b/app/views/issue_categories/new.html.erb
@@ -4,4 +4,5 @@
                       :url => project_issue_categories_path(@project) do |f| %>
 <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/issue_statuses/edit.html.erb b/app/views/issue_statuses/edit.html.erb
old mode 100644
new mode 100755
index 425ab43..29670a8
--- a/app/views/issue_statuses/edit.html.erb
+++ b/app/views/issue_statuses/edit.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for @issue_status do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/issue_statuses/new.html.erb b/app/views/issue_statuses/new.html.erb
old mode 100644
new mode 100755
index 86f2131..6361d6c
--- a/app/views/issue_statuses/new.html.erb
+++ b/app/views/issue_statuses/new.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for @issue_status do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb
old mode 100644
new mode 100755
index 23817f8..c30afc1
--- a/app/views/issues/bulk_edit.html.erb
+++ b/app/views/issues/bulk_edit.html.erb
@@ -188,7 +188,7 @@
 
 <% if @values_by_custom_field.present? %>
 <div class="flash warning">
-  <%= l(:warning_fields_cleared_on_bulk_edit) %>:<br /> 
+  <%= l(:warning_fields_cleared_on_bulk_edit) %>:<br />
   <%= safe_join(@values_by_custom_field.map {|field, ids| content_tag "span", "#{field.name} (#{ids.size})"}, ', ') %>
 </div>
 <% end %>
@@ -204,6 +204,7 @@
   <% else %>
     <%= submit_tag l(:button_submit) %>
   <% end %>
+    <%= link_to l(:button_cancel), url_for(:back) %>
 </p>
 
 <% end %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
old mode 100644
new mode 100755
index ec7f262..e50e7d0
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -51,6 +51,7 @@
   <%= submit_tag l(:button_create) %>
   <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
   <%= preview_link preview_new_issue_path(:project_id => @issue.project), 'issue-form' %>
+  | <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
 
 <div id="preview" class="wiki"></div>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
old mode 100644
new mode 100755
index 44c75f2..4627ba4
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -34,7 +34,10 @@
   <%= call_hook(:view_my_account, :user => @user, :form => f) %>
 </fieldset>
 
-<p class="mobile-hide"><%= submit_tag l(:button_save) %></p>
+<p class="mobile-hide">
+  <%= submit_tag l(:button_save) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
+</p>
 </div>
 
 <div class="splitcontentright">
diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb
old mode 100644
new mode 100755
index 4e4cf2e..7f2cec5
--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@@ -4,6 +4,7 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %>
+| <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
 <div id="preview" class="wiki"></div>
 
diff --git a/app/views/news/new.html.erb b/app/views/news/new.html.erb
old mode 100644
new mode 100755
index f96dd5c..2ebb962
--- a/app/views/news/new.html.erb
+++ b/app/views/news/new.html.erb
@@ -5,5 +5,6 @@
   <%= render :partial => 'news/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create) %>
   <%= preview_link preview_news_path(:project_id => @project), 'news-form' %>
+  | <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/projects/_edit.html.erb b/app/views/projects/_edit.html.erb
old mode 100644
new mode 100755
index 5c60b17..a6a6345
--- a/app/views/projects/_edit.html.erb
+++ b/app/views/projects/_edit.html.erb
@@ -1,4 +1,5 @@
 <%= labelled_form_for @project, :html => {:multipart => true} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
old mode 100644
new mode 100755
index e593822..b6f856d
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -4,4 +4,5 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb
old mode 100644
new mode 100755
index 27a27de..d3544c2
--- a/app/views/projects/settings/_activities.html.erb
+++ b/app/views/projects/settings/_activities.html.erb
@@ -39,4 +39,5 @@
 </div>
 
 <%= submit_tag l(:button_save) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/projects/settings/_modules.html.erb b/app/views/projects/settings/_modules.html.erb
old mode 100644
new mode 100755
diff --git a/app/views/projects/settings/_wiki.html.erb b/app/views/projects/settings/_wiki.html.erb
old mode 100644
new mode 100755
diff --git a/app/views/roles/edit.html.erb b/app/views/roles/edit.html.erb
old mode 100644
new mode 100755
index dc52202..b5e7cf7
--- a/app/views/roles/edit.html.erb
+++ b/app/views/roles/edit.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/roles/new.html.erb b/app/views/roles/new.html.erb
old mode 100644
new mode 100755
index 752992c..51d3901
--- a/app/views/roles/new.html.erb
+++ b/app/views/roles/new.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
old mode 100644
new mode 100755
index a4b1449..156132e
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -58,5 +58,8 @@
 </table>
 </div>
 <p><%= check_all_links 'permissions_form' %></p>
-<p><%= submit_tag l(:button_save) %></p>
+<p>
+  <%= submit_tag l(:button_save) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
+</p>
 <% end %>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
old mode 100644
new mode 100755
index 1e80d57..c1c79f7
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -32,7 +32,10 @@
 <%= hidden_field_tag 'options', '', :id => 'show-options' %>
 
 </div>
-<p><%= submit_tag l(:button_submit) %></p>
+<p>
+  <%= submit_tag l(:button_submit) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
+</p>
 <% end %>
 
 <% if @results %>
diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb
old mode 100644
new mode 100755
index 640f7d8..6d4514c
--- a/app/views/timelog/bulk_edit.html.erb
+++ b/app/views/timelog/bulk_edit.html.erb
@@ -46,5 +46,8 @@
   </div>
 </div>
 
-<p><%= submit_tag l(:button_submit) %></p>
+<p>
+  <%= submit_tag l(:button_submit) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
+</p>
 <% end %>
diff --git a/app/views/timelog/edit.html.erb b/app/views/timelog/edit.html.erb
old mode 100644
new mode 100755
index 89a60b7..66cb853
--- a/app/views/timelog/edit.html.erb
+++ b/app/views/timelog/edit.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry), :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/timelog/new.html.erb b/app/views/timelog/new.html.erb
old mode 100644
new mode 100755
index 593eb2b..719480f
--- a/app/views/timelog/new.html.erb
+++ b/app/views/timelog/new.html.erb
@@ -4,4 +4,5 @@
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>
   <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb
old mode 100644
new mode 100755
index 7b5b7ea..09f6953
--- a/app/views/trackers/_form.html.erb
+++ b/app/views/trackers/_form.html.erb
@@ -41,6 +41,7 @@
 <!--[eoform:tracker]-->
 </div>
 <%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 </div>
 
 <div class="splitcontentright">
diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb
old mode 100644
new mode 100755
index 8ba1c3a..c94e897
--- a/app/views/trackers/fields.html.erb
+++ b/app/views/trackers/fields.html.erb
@@ -68,7 +68,10 @@
     </tbody>
     </table>
     </div>
-    <p><%= submit_tag l(:button_save) %></p>
+    <p>
+      <%= submit_tag l(:button_save) %>
+      <%= link_to l(:button_cancel), url_for(:back) %>
+    </p>
     <% @trackers.each do |tracker| %>
       <%= hidden_field_tag "trackers[#{tracker.id}][core_fields][]", '' %>
       <%= hidden_field_tag "trackers[#{tracker.id}][custom_field_ids][]", '' %>
diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb
old mode 100644
new mode 100755
index fddea54..6d3b7ec
--- a/app/views/users/_general.html.erb
+++ b/app/views/users/_general.html.erb
@@ -4,4 +4,5 @@
     <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
   <% end -%>
   <p><%= submit_tag l(:button_save) %></p>
+
 <% end %>
diff --git a/app/views/users/_groups.html.erb b/app/views/users/_groups.html.erb
old mode 100644
new mode 100755
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
old mode 100644
new mode 100755
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
old mode 100644
new mode 100755
index e9eb102..5d357b2
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -8,6 +8,7 @@
   <p>
     <%= submit_tag l(:button_create) %>
     <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+    <%= link_to l(:button_cancel), url_for(:back) %>
   </p>
 <% end %>
 
diff --git a/app/views/versions/edit.html.erb b/app/views/versions/edit.html.erb
old mode 100644
new mode 100755
index db6bb84..fd421d2
--- a/app/views/versions/edit.html.erb
+++ b/app/views/versions/edit.html.erb
@@ -3,5 +3,6 @@
 <%= labelled_form_for @version, :html => {:multipart => true} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
 
diff --git a/app/views/versions/new.html.erb b/app/views/versions/new.html.erb
old mode 100644
new mode 100755
index b52436d..082cf59
--- a/app/views/versions/new.html.erb
+++ b/app/views/versions/new.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for @version, :url => project_versions_path(@project), :html => {:multipart => true} do |f| %>
 <%= render :partial => 'versions/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>
diff --git a/app/views/wiki/new.html.erb b/app/views/wiki/new.html.erb
old mode 100644
new mode 100755
index d067420..34f5c16
--- a/app/views/wiki/new.html.erb
+++ b/app/views/wiki/new.html.erb
@@ -13,5 +13,6 @@
   </div>
 
   <%= submit_tag(l(:label_next)) %>
+  <%= link_to l(:button_cancel), url_for(:back) %>
 
 <% end %>
diff --git a/app/views/workflows/copy.html.erb b/app/views/workflows/copy.html.erb
old mode 100644
new mode 100755
index 78997ca..c247acb
--- a/app/views/workflows/copy.html.erb
+++ b/app/views/workflows/copy.html.erb
@@ -35,4 +35,5 @@
 </p>
 </fieldset>
 <%= submit_tag l(:button_copy) %>
+<%= link_to l(:button_cancel), url_for(:back) %>
 <% end %>