diff --git a/app/views/manage_products/index.rhtml b/app/views/manage_products/index.rhtml
index bd4610f..96dcda6 100644
--- a/app/views/manage_products/index.rhtml
+++ b/app/views/manage_products/index.rhtml
@@ -18,7 +18,9 @@
   <% end %>
 </table>
 
-<p> <%= link_to _('New product or service'), :action => 'new' %> </p>
+<%= button :add, _('New product or service'), :action => 'new' %>
+
+<br /> &nbsp;
 
 <h3> <%=_('Listing raw materials') %> </h3>
 
@@ -42,6 +44,9 @@
   <% end %>
 </table>
 
-<p> <%= link_to _('Add raw material'), :action => 'new_consumption' %> </p>
+<%= button :add, _('Add raw material'), :action => 'new_consumption' %>
+
+<p>
+<%= link_to_myprofile( '<span>'+ _('Back') +'</span>', {}, @profile.identifier, :class => 'button with-text icon-back' ) %>
+</p>
 
-<%= link_to_myprofile(_('Back'), {}, @profile.identifier)  %>
diff --git a/app/views/manage_products/show.rhtml b/app/views/manage_products/show.rhtml
index be1fd61..12e8be2 100644
--- a/app/views/manage_products/show.rhtml
+++ b/app/views/manage_products/show.rhtml
@@ -1,11 +1,12 @@
 <h3> <%= @product.name %> </h3>
 
 <p> <%= image_tag @product.image.public_filename if @product.image %> </p>
-<p> <%= _('Price:') %> <%= @product.price %> </p>
-<p> <%= _('Description:') %> <%= @product.description %> </p>
-<p> <%= _('Category:') %> <%= link_to_category(@product.product_category) %> </p>
+<p> <strong><%= _('Price:') %></strong> <%= @product.price %> </p>
+<p> <strong><%= _('Description:') %></strong> <%= txt2html @product.description  if @product.description %> </p>
+<p> <strong><%= _('Category:') %></strong> <%= link_to_category(@product.product_category) %> </p>
+
+<%= button :back, _('back'), :action => 'index' %>
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+<%= button :delete, _('destroy'), :action => 'destroy', :id => @product %>
+<%= button :edit, _('edit'), :action => 'edit', :id => @product %>
 
-<%= link_to _('edit'), :action => 'edit', :id => @product %>
-<%= link_to _('destroy'), :action => 'destroy', :id => @product %>
-<br/>
-<%= link_to _('back'), :action => 'index' %>
--
libgit2 0.21.2