diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb
index 21280e1af..89df7aae5 100644
--- a/app/views/boards/index.html.erb
+++ b/app/views/boards/index.html.erb
@@ -1,3 +1,9 @@
+<div class="contextual">
+  <%= link_to_if_authorized l(:label_settings),
+              {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'},
+              :class => 'icon icon-settings' if User.current.allowed_to?(:manage_boards, @project) %>
+</div>
+
 <h2><%= l(:label_board_plural) %></h2>
 
 <table class="list boards">
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 02dffa278..b80ff0383 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -6,6 +6,10 @@
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.allowed_to?(:add_messages, @board.project) %>
 <%= watcher_link(@board, User.current) %>
+<%= link_to_if_authorized l(:label_settings),
+            {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'},
+            :class => 'icon icon-settings' if User.current.allowed_to?(:manage_boards, @project) %>
+
 </div>
 
 <div id="add-message" style="display:none;">
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index d5a77ca51..5efc22205 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -2,6 +2,9 @@
   <% if User.current.allowed_to?(:add_issues, @project, :global => true) && (@project.nil? || Issue.allowed_target_trackers(@project).any?) %>
     <%= link_to l(:label_issue_new), _new_project_issue_path(@project), :class => 'icon icon-add new-issue' %>
   <% end %>
+  <%= link_to_if_authorized l(:label_settings),
+              {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'issues'},
+              :class => 'icon icon-settings' if User.current.allowed_to?(:manage_categories, @project) %>
 </div>
 
 <h2><%= @query.new_record? ? l(:label_issue_plural) : @query.name %></h2>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 16645b759..d9bb5274d 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -9,6 +9,10 @@
       <%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-unlock' %>
     <% end %>
   <% end %>
+  <%= link_to_if_authorized l(:label_settings),
+              {:controller => 'projects', :action => 'settings', :id => @project},
+              :class => 'icon icon-settings' if User.current.allowed_to?(:edit_project, @project) %>
+
 </div>
 
 <h2><%=l(:label_overview)%></h2>
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index 0bd6e33cf..37a2f177c 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -15,6 +15,10 @@
             {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
             :class => 'icon icon-stats' if @repository.supports_all_revisions? %>
 
+<%= link_to_if_authorized l(:label_settings),
+            {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'repositories'},
+            :class => 'icon icon-settings' if User.current.allowed_to?(:manage_repository, @project) %>
+
 <%= form_tag({:action => controller.action_name,
              :id => @project,
              :repository_id => @repository.identifier_param,
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index 35e833efb..e78e09308 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -2,6 +2,9 @@
 <%= link_to l(:button_log_time), 
             _new_time_entry_path(@project, @query.filtered_issue_id),
             :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
+<%= link_to_if_authorized l(:label_settings),
+            {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'},
+            :class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %>
 </div>
 
 <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb
index b5307c4af..d4df38d99 100644
--- a/app/views/timelog/report.html.erb
+++ b/app/views/timelog/report.html.erb
@@ -2,6 +2,9 @@
 <%= link_to l(:button_log_time),
             _new_time_entry_path(@project, @issue),
             :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
+<%= link_to_if_authorized l(:label_settings),
+            {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'},
+            :class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %>
 </div>
 
 <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 429bc5b92..ebd7a4f49 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -1,6 +1,9 @@
 <div class="contextual">
   <%= link_to(l(:label_version_new), new_project_version_path(@project),
               :class => 'icon icon-add') if User.current.allowed_to?(:manage_versions, @project) %>
+  <%= link_to_if_authorized l(:label_settings),
+              {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'versions'},
+              :class => 'icon icon-settings' if User.current.allowed_to?(:manage_versions, @project) %>
 </div>
 
 <h2><%=l(:label_roadmap)%></h2>