diff --git a/app/views/templates/index.html.erb b/app/views/templates/index.html.erb
index 7d60e48..afe0f7c 100644
--- a/app/views/templates/index.html.erb
+++ b/app/views/templates/index.html.erb
@@ -1,19 +1,26 @@
 <h1><%= _('Edit Templates') %></h1>
 
+<%= _('Manage the templates used on creation of profiles') %>
+
 <% list_of_templates = [[_('Person')    , Person.templates    , 'person'    ],
                         [_('Community') , Community.templates , 'community' ],
                         [_('Enterprise'), Enterprise.templates, 'enterprise']] %>
 
-<ul>
-  <% list_of_templates.each do |title, templates, kind|%>
-    <li><%= title %></li>
+<% list_of_templates.each do |title, templates, kind|%>
+  <div class='template-kind'>
+    <h2><%= title %></h2>
+    <%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>
     <ul>
       <% templates.each do |template| %>
-        <li><%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}) %></li>
+        <li>
+          <%= image_tag "icons-app/#{kind}-icon.png" %>
+          <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
+        </li>
       <% end %>
-      <li><strong>
-        <%= link_to(_('New...'), {:action => "create_#{kind}_template"}) %>
-      </strong></li>
     </ul>
-  <% end %>
-</ul>
+  </div>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ac13832..ceb1a51 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -5928,6 +5928,29 @@ h1#agenda-title {
   font-size: 20px;
 }
 
+/* Templates */
+
+.controller-templates .template-kind {
+  border-bottom: 1px solid #CCC;
+}
+
+.controller-templates .template-kind ul {
+  padding-left: 5px;
+}
+
+.controller-templates .template-kind li {
+  list-style: none;
+  padding: 3px;
+}
+
+.controller-templates .template-kind li:hover {
+  background-color: #f0f0f0;
+}
+
+.controller-templates .template-kind li a {
+  font-size: 13px;
+}
+
 /* }}} */
 
 #alt-beautify {
--
libgit2 0.21.2