diff --git a/umap/templates/leaflet_storage/category_form.html b/umap/templates/leaflet_storage/category_form.html
index c1915a60..5a7f295c 100644
--- a/umap/templates/leaflet_storage/category_form.html
+++ b/umap/templates/leaflet_storage/category_form.html
@@ -6,21 +6,13 @@
     {% endfor %}
     {% foundation_field form.name %}
     {% foundation_field form.description %}
-    {% foundation_field form.color %}
-    <div class="formbox columns twelve">
-        <div class="six columns">
-            {% foundation_field form.icon_class %}
-        </div>
-        <div class="six columns">
-            {% foundation_field form.pictogram %}
-        </div>
-    </div>
     {% foundation_field form.rank %}
     <div class="formbox">
         <span>{{ form.display_on_load.label }}</span>{{ form.display_on_load }}
     </div>
     <small class="help-text">{{ form.display_on_load.help_text }}</small>
     {{ form.map }}
+    {% include "umap/styles_fieldset.html" %}
     <input type="submit" class="button" />
     {% if delete_url %}
         <a href="{{ delete_url }}" id="delete_category_button" >{% trans "Delete" %}</a>
diff --git a/umap/templates/leaflet_storage/feature_form.html b/umap/templates/leaflet_storage/feature_form.html
index f1f97f7e..5fafacda 100644
--- a/umap/templates/leaflet_storage/feature_form.html
+++ b/umap/templates/leaflet_storage/feature_form.html
@@ -4,10 +4,8 @@
     {{ form.no_field_errors }}
     {% foundation_field form.name %}
     {% foundation_field form.description %}
-    {% foundation_field form.color %}
-    <p>
     {% foundation_field form.category %}
-    </p>
+    {% include "umap/styles_fieldset.html" %}
     {{ form.latlng }}
     <input type="submit" class="button" />
     {% if delete_url %}
diff --git a/umap/templates/umap/styles_fieldset.html b/umap/templates/umap/styles_fieldset.html
new file mode 100644
index 00000000..b9057732
--- /dev/null
+++ b/umap/templates/umap/styles_fieldset.html
@@ -0,0 +1,15 @@
+{% load umap_tags i18n %}
+<fieldset>
+    <legend>{% trans "Styles" %}</legend>
+    {% foundation_field form.color %}
+    {% if form.icon_class and form.pictogram %}
+    <div class="formbox columns twelve">
+        <div class="six columns">
+            {% foundation_field form.icon_class %}
+        </div>
+        <div class="six columns">
+            {% foundation_field form.pictogram %}
+        </div>
+    </div>
+    {% endif %}
+</fieldset>