diff --git a/app/views/planning_element_type_colors/_form.html.erb b/app/views/planning_element_type_colors/_form.html.erb
index 633c22a0f9..788d68751f 100644
--- a/app/views/planning_element_type_colors/_form.html.erb
+++ b/app/views/planning_element_type_colors/_form.html.erb
@@ -34,21 +34,13 @@ See doc/COPYRIGHT.rdoc for more details.
 <fieldset class="timelines-color-properties">
   <legend><%= l('timelines.properties') %></legend>
 
-  <p>
-    <%= f.label :name do %>
-      <%= required_field_name PlanningElementTypeColor.human_attribute_name(:name) %>
-    <% end %>
+  <div class="form--field">
     <%= f.text_field :name, required: true %>
-  </p>
-
-  <p>
-    <%= f.label :hexcode do %>
-      <%= PlanningElementTypeColor.human_attribute_name(:hexcode) %>
-      <span class="required"> *</span>
-    <% end %>
-    <%= icon_for_color(color, :class => 'timelines-x-update-color timelines-color-properties-preview') %>
+  </div>
+  <div class="form--field">
     <%= f.text_field :hexcode, required: true %>
-  </p>
+    <%= icon_for_color(color, :class => 'timelines-x-update-color timelines-color-properties-preview') %>
+  </div>
 </fieldset>
 
 <%= submit_tag l(:button_save), class: 'button -highlight' %>
diff --git a/app/views/planning_element_type_colors/edit.html.erb b/app/views/planning_element_type_colors/edit.html.erb
index d54aa7735d..05212396e2 100644
--- a/app/views/planning_element_type_colors/edit.html.erb
+++ b/app/views/planning_element_type_colors/edit.html.erb
@@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{l("timelines.admin_menu.color")} #{@color.name}" %>
 
-<%= form_for :color,
+<%= labelled_tabular_form_for @color,
             :url  => color_url(@color),
             :html => {:method => 'put'} do |f| %>
   <%= render :partial => 'form',
diff --git a/app/views/planning_element_type_colors/new.html.erb b/app/views/planning_element_type_colors/new.html.erb
index 6b196f0391..84b24720bb 100644
--- a/app/views/planning_element_type_colors/new.html.erb
+++ b/app/views/planning_element_type_colors/new.html.erb
@@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% html_title l(:label_administration), "#{l(:label_new)} #{l("timelines.admin_menu.color")}" %>
 
-<%= form_for :color,
+<%= labelled_tabular_form_for @color,
             :url  => colors_url,
             :html => {:method => 'post'} do |f| %>
   <%= render :partial => 'form',