diff --git a/app/helpers/assets_helper.rb b/app/helpers/assets_helper.rb
index ee9dab9..f0e2991 100644
--- a/app/helpers/assets_helper.rb
+++ b/app/helpers/assets_helper.rb
@@ -9,10 +9,6 @@ module AssetsHelper
       [ "#", "icon-menu-enterprise", _('Enterprises') ],
       [ "#", "icon-menu-community",  _('Communities') ],
 
-      # FIXME remove these
-      [ "#", "icon-menu-",           _('bli 1') ],
-      [ "#", "icon-menu-",           _('bli 2') ],
-
     ].map do |target,css_class,name|
       content_tag('li', link_to(content_tag('span', '', :class => css_class) + name, target))
     end.join("\n")
diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb
index dbec31d..ff0c20f 100644
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -44,9 +44,18 @@ module BoxesHelper
     result = extract_block_content(content)
     footer = extract_block_content(footer)
 
-    classes = ['block', block.css_class_name ].uniq.join(' ')
+    options = {
+      :class => classes = ['block', block.css_class_name ].uniq.join(' '),
+      :id => "block-#{block.id}"
+    }
+    if ( block.respond_to? 'help' )
+      options[:help] = block.help
+    end
 
-    box_decorator.block_target(block.box, block) + content_tag('div', result + footer + box_decorator.block_edit_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block)
+    box_decorator.block_target(block.box, block) +
+    content_tag('div', result + footer + box_decorator.block_edit_buttons(block),
+                options) +
+    box_decorator.block_handle(block)
   end
 
   def extract_block_content(content)
diff --git a/app/models/tags_block.rb b/app/models/tags_block.rb
index 8968e29..492ef9b 100644
--- a/app/models/tags_block.rb
+++ b/app/models/tags_block.rb
@@ -7,12 +7,13 @@ class TagsBlock < Block
     _('List count of contents by tag')
   end
 
+  def help
+    _('The tag is created when you add some one to your article. <p/>
+       Try to add some tags to some articles and see your tag cloud to grow.')
+  end
+
   def content
     block_title(_('Tags')) +
-    help_textile(
-              _('The tag is created when you add some one to your article.
-                 Try to add some tags to some articles and see your tag cloud to grow.'),
-              _('How tags works here?'), :class => 'help_tags' ) +
     "\n<div class='tag_cloud'>\n"+
     tag_cloud( owner.tags, :id,
                owner.generate_url(:controller => 'profile', :action => 'tag') + '/',
diff --git a/public/designs/icons/default/help-off-32x32-HC.gif b/public/designs/icons/default/help-off-32x32-HC.gif
index c621877..3bf7e2d 100644
Binary files a/public/designs/icons/default/help-off-32x32-HC.gif and b/public/designs/icons/default/help-off-32x32-HC.gif differ
diff --git a/public/designs/icons/default/help-on-32x32-HC.gif b/public/designs/icons/default/help-on-32x32-HC.gif
index f43059b..ba74fd0 100644
Binary files a/public/designs/icons/default/help-on-32x32-HC.gif and b/public/designs/icons/default/help-on-32x32-HC.gif differ
diff --git a/public/images/logo-anhetegua.png b/public/images/logo-anhetegua.png
index b8441f1..11ba6b8 100644
Binary files a/public/images/logo-anhetegua.png and b/public/images/logo-anhetegua.png differ
diff --git a/public/img-source/help.xcf b/public/img-source/help.xcf
index c661839..c7969d1 100644
Binary files a/public/img-source/help.xcf and b/public/img-source/help.xcf differ
diff --git a/public/javascripts/show-mouse-help.js b/public/javascripts/show-mouse-help.js
index c01eced..b2dbd35 100644
--- a/public/javascripts/show-mouse-help.js
+++ b/public/javascripts/show-mouse-help.js
@@ -121,7 +121,7 @@ function getHelp( ev ) {
             var txtEl = el.ownerDocument.getElementById( txt.replace(/#/,"") );
             if ( txtEl ) txt = txtEl.innerHTML;
           }
-          box.content.innerHTML = '<p/>'+ txt +
+          box.content.innerHTML = '<p>'+ txt +'</p>'+
                                   '<br style="clear:both" />'+
                                   '<div class="help-force-clear-ieworkarroundbug"'+
                                   ' style="height:1px; overflow:hidden"></div>';
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 62129bf..50e8d2d 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -313,6 +313,12 @@ div#notice {
   margin: 10px 0px;
   color: #2A5896;
 }
+#content h1 { font-size: 24px }
+#content h2 { font-size: 20px }
+#content h3 { font-size: 18px }
+#content h4 { font-size: 16px }
+#content h5 { font-size: 14px }
+#content h6 { font-size: 12px }
 body.category1 #content h1, body.category1 #content h2, body.category1 #content h3,
 body.category1 #content h4, body.category1 #content h5, body.category1 #content h6
  { color: #E26B00 }
--
libgit2 0.21.2