diff --git a/app/views/email_templates/index.html.erb b/app/views/email_templates/index.html.erb
index 26a9651..3bf0329 100644
--- a/app/views/email_templates/index.html.erb
+++ b/app/views/email_templates/index.html.erb
@@ -1,25 +1,27 @@
-<h1><%= _('Email Templates') %></h1>
+<div class="email-templates">
+  <h1><%= _('Email Templates') %></h1>
 
-<table>
-  <tr>
-    <th><%= _('Name') %></th>
-    <th><%= _('Type') %></th>
-    <th></th>
-  </tr>
+  <table>
+    <tr>
+      <th><%= _('Name') %></th>
+      <th><%= _('Type') %></th>
+      <th><%= _('Actions') %></th>
+    </tr>
 
-<% @email_templates.each do |email_template| %>
-  <tr>
-    <td><%= email_template.name %></td>
-    <td><%= email_template.available_types[email_template.template_type][:description] if email_template.template_type.present? %></td>
-    <td>
-      <%= link_to 'Edit', url_for(:controller => :email_templates, :action => :edit, :id => email_template.id) %>
-      <%= link_to 'Destroy', url_for(:controller => :email_templates, :action => :destroy, :id => email_template.id), method: :delete, data: { confirm: 'Are you sure?' } %>
-    </td>
-  </tr>
-<% end %>
-</table>
+  <% @email_templates.each do |email_template| %>
+    <tr>
+      <td><%= email_template.name %></td>
+      <td><%= email_template.available_types[email_template.template_type][:description] if email_template.template_type.present? %></td>
+      <td>
+        <%= button_without_text(:edit, _('Edit'), {:controller => :email_templates, :action => :edit, :id => email_template.id}) %>
+        <%= button_without_text(:remove, _('Remove'), {:controller => :email_templates, :action => :destroy, :id => email_template.id}, method: :delete, data: { confirm: 'Are you sure?' }) %>
+      </td>
+    </tr>
+  <% end %>
+  </table>
 
-<br />
+  <br />
 
-<%= button(:new, _('New template'), :controller => :email_templates, :action => :new) %>
-<%= button(:back, _('Back to control panel'), :controller => :profile_editor) %>
+  <%= button(:new, _('New template'), :controller => :email_templates, :action => :new) %>
+  <%= button(:back, _('Back to control panel'), :controller => :profile_editor) %>
+</div>
diff --git a/public/stylesheets/email-templates.css b/public/stylesheets/email-templates.css
index 6cf4b4b..556ecd0 100644
--- a/public/stylesheets/email-templates.css
+++ b/public/stylesheets/email-templates.css
@@ -13,3 +13,6 @@
   text-decoration: none;
   font-size: 10px;
 }
+.email-templates table td {
+  text-align: center;
+}
--
libgit2 0.21.2