diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 415dd4c..8c6f48e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -158,12 +158,10 @@ module ApplicationHelper
     @profile || raise("There is no current profile")
   end
 
-  # displays an 
-  #
-  # Current implementation generates a <label> tag for +label+ and wrap the
-  # label and the control with a <div> tag with class 'formfield' 
-  def labelled_form_field(label, html_for_field)
-    content_tag('div', content_tag('div', content_tag('label', label)) + html_for_field, :class => 'formfield') 
+  # create a form field structure (as if it were generated with
+  # labelled_form_for), but with a customized control and label.
+  def labelled_form_field(label, field_html)
+    NoosferoFormBuilder::output_field(label, field_html)
   end
   alias_method :display_form_field, :labelled_form_field
 
@@ -179,20 +177,32 @@ module ApplicationHelper
 
   class NoosferoFormBuilder < ActionView::Helpers::FormBuilder
     include GetText
+    extend ActionView::Helpers::TagHelper
+
+    def self.output_field(text, field_html, field_id = nil)
+      # try to guess an id if none given
+      if field_id.nil?
+        field_html =~ /id=['"]([^'"]*)['"]/
+        field_id = $1
+      end
+
+      label_html = content_tag('label', text, :class => 'formlabel', :for => field_id)
+      control_html = content_tag('div', field_html, :class => 'formfield' )
+
+      content_tag('div', label_html + control_html, :class => 'formfieldline' )
+    end
 
     (field_helpers - %w(hidden_field)).each do |selector|
       src = <<-END_SRC
         def #{selector}(field, *args, &proc)
           column = object.class.columns_hash[field.to_s]
-          "<div class='formfieldline'>" +
-          "\n  <label class='formlabel'" +
-          " for='\#{object.class.to_s.downcase}_\#{field}'>" +
-          ( column ?
-            column.human_name :
-            _(field.to_s.humanize)
-          ) +
-          "</label>" +
-          "\n  <div class='formfield #{selector}'>" + super + "</div>\n</div>"
+          text =
+            ( column ?
+              column.human_name :
+              _(field.to_s.humanize)
+            )
+
+          NoosferoFormBuilder::output_field(text, super)
         end
       END_SRC
       class_eval src, __FILE__, __LINE__
diff --git a/app/views/cms/_rss_feed.rhtml b/app/views/cms/_rss_feed.rhtml
index 0378fd7..9886e4a 100644
--- a/app/views/cms/_rss_feed.rhtml
+++ b/app/views/cms/_rss_feed.rhtml
@@ -1,7 +1,7 @@
 <%= f.text_field :name %>
 
-<%= labelled_form_field(_('Limit of articles'), f.text_field(:limit)) %>
+<%= labelled_form_field(_('Limit of articles'), text_field(:article, :limit)) %>
 
-<%= labelled_form_field(_('Use as item description:'), f.select(:feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %>
+<%= labelled_form_field(_('Use as item description:'), select(:article, :feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %>
 
-<%= labelled_form_field(_('Include:'), f.select(:include, [ [ _('All articles'), 'all' ], [ _('Only articles child of the same article as the feed'), 'parent_and_children']] )) %>
+<%= labelled_form_field(_('Include in the feed:'), select(:article, :include, [ [ _('All articles'), 'all' ], [ _('Only articles child of the same article as the feed'), 'parent_and_children']] )) %>
diff --git a/app/views/cms/_uploaded_file.rhtml b/app/views/cms/_uploaded_file.rhtml
index 77c52ea..5cd7fc9 100644
--- a/app/views/cms/_uploaded_file.rhtml
+++ b/app/views/cms/_uploaded_file.rhtml
@@ -1,3 +1,3 @@
 <%= labelled_form_field(_('Select the file you want to upload.'), file_field(:article, :uploaded_data)) %>
 
-<%= labelled_form_field(_('Describe this file:'), f.text_area(:abstract)) %>
+<%= labelled_form_field(_('Describe this file:'), text_area(:article, :abstract)) %>
diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index eb7f6a4..4c20744 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -48,7 +48,10 @@
 <%# display the article content %>
 <div id='article-contents' style='clear: left;'>
   <% if @article %>
-    <h2><%= @article.name %></h2>
+    <h2>
+      <%= @article.name %>
+      <%= image_tag(icon_for_article(@article)) %>
+    </h2>
     <% button_bar(:id => 'article-controls') do %>
 
       <ul>
--
libgit2 0.21.2