Index: app/views/projects/settings/_custom_field_checkbox.html.erb
new file mode 100644
===================================================================
--- /dev/null
+++ app/views/projects/settings/_custom_field_checkbox.html.erb
@@ -0,0 +1,6 @@
+    <label class="floating">
+      <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field),
+          :disabled => (custom_field.is_for_all? ? "disabled" : nil),
+          :id => nil %>
+      <%= custom_field_name_tag(custom_field) %>
+    </label>
\ No newline at end of file
Index: app/views/projects/settings/_issues.html.erb
===================================================================
--- tmp/7a4gKg__issues.html.erb
+++ app/views/projects/settings/_issues.html.erb
@@ -3,27 +3,53 @@
 
   <% unless @trackers.empty? %>
   <fieldset class="box tabular" id="project_trackers"><legend><%= toggle_checkboxes_link('#project_trackers input[type=checkbox]') %><%= l(:label_tracker_plural)%></legend>
-  <% @trackers.each do |tracker| %>
+    <% @trackers.each do |tracker| %>
     <label class="floating">
       <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.to_a.include?(tracker), :id => nil %>
       <%= tracker %>
     </label>
-  <% end %>
+    <% end %>
   <%= hidden_field_tag 'project[tracker_ids][]', '' %>
   </fieldset>
   <% end %>
 
-  <% unless @issue_custom_fields.empty? %>
-  <fieldset class="box tabular" id="project_issue_custom_fields"><legend><%= toggle_checkboxes_link('#project_issue_custom_fields input[type=checkbox]:enabled') %><%=l(:label_custom_field_plural)%></legend>
-  <% @issue_custom_fields.each do |custom_field| %>
-    <label class="floating">
-      <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field),
-          :disabled => (custom_field.is_for_all? ? "disabled" : nil),
-          :id => nil %>
-      <%= custom_field_name_tag(custom_field) %>
-    </label>
-  <% end %>
-  <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
+<%
+  unless @issue_custom_fields.empty?
+    all_issue_custom_fields = @project.all_issue_custom_fields
+-%>
+  <fieldset class="box tabular" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
+    <fieldset class="box tabular" id="project_issue_custom_fields_for_all"><legend><b><%= l(:label_tracker_all) %></b></legend>
+    <% @issue_custom_fields.select(&:is_for_all?).each do |custom_field| %>
+<%= render :partial => 'projects/settings/custom_field_checkbox', :locals => {:custom_field => custom_field, :all_issue_custom_fields => all_issue_custom_fields} %>
+    <% end %>
+    </fieldset>
+
+    <fieldset class="box tabular" id="project_issue_custom_fields_multiple"><legend><%= toggle_checkboxes_link('#project_issue_custom_fields_multiple input[type=checkbox]:enabled') %><b><%= l(:label_tracker_plural) %> : <%= l(:field_multiple) %></b></legend>
+    <% @issue_custom_fields.select{|cf| cf.trackers.size > 1}.each do |custom_field| %>
+<%= render :partial => 'projects/settings/custom_field_checkbox', :locals => {:custom_field => custom_field, :all_issue_custom_fields => all_issue_custom_fields} %>
+    <% end %>
+    </fieldset>
+
+<%
+    single_tracker_issue_custom_fields = @issue_custom_fields.select{|cf| cf.trackers.size == 1}
+    if single_tracker_issue_custom_fields.any?
+-%>
+    <fieldset class="box tabular" id="project_issue_custom_fields_for_tracker"><legend><b><%=l(:label_tracker)%></b></legend>
+<%
+      Tracker.sorted.each do |t|
+        issue_custom_fields_for_tracker = single_tracker_issue_custom_fields.select{|cf| cf.trackers.first == t}
+        if issue_custom_fields_for_tracker.any?
+-%>
+      <fieldset class="box tabular" id="project_issue_custom_fields_tracker_<%= t.id %>"><legend><%= toggle_checkboxes_link("#project_issue_custom_fields_tracker_#{t.id} input[type=checkbox]:enabled") %><b><%= t.name %></b></legend>
+        <% issue_custom_fields_for_tracker.each do |custom_field| %>
+<%= render :partial => 'projects/settings/custom_field_checkbox', :locals => {:custom_field => custom_field, :all_issue_custom_fields => all_issue_custom_fields} %>
+          <% end %>
+      </fieldset>
+        <% end %>
+      <% end %>
+    </fieldset>
+    <% end %>
+    <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
   </fieldset>
   <% end %>