diff --git a/app/views/themes/index.rhtml b/app/views/themes/index.rhtml
index 8bffd86..7d6a668 100644
--- a/app/views/themes/index.rhtml
+++ b/app/views/themes/index.rhtml
@@ -13,9 +13,11 @@
         <%
           selected = (!template.nil? && (@current_template == template.id))
         %>
-        <td>
+        <td class="template-preview-cell">
           <% if template %>
-            <%= image_tag("/designs/templates/#{template.id}/thumbnail.png", :alt => _('The "%s" template')) %>
+            <%= image_tag("/designs/templates/#{template.id}/thumbnail.png",
+                :class => 'template-preview',
+                :alt => _('The "%s" template')) %>
           <% end %>
         </td>
         <td <%= 'class="selected template"' if selected %>>
@@ -49,9 +51,10 @@
             selected = (!theme.nil? && (theme.id == @current_theme))
           %>
           <td>
-            <%# FIXME add proper thumbnails %>
             <% if theme %>
-              <%= image_tag('/images/icons-app/design-editor.png', :alt => (_('The "%s" theme.') % theme.name)) %>
+              <%= image_tag("/designs/themes/#{theme.name}/preview.png",
+                  :class => 'theme-preview',
+                  :alt => (_('The "%s" theme.') % theme.name)) %>
             <% end %>
           </td>
           <td <%= 'class="selected theme"' if selected %>>
diff --git a/public/designs/themes/aluminium/preview.png b/public/designs/themes/aluminium/preview.png
new file mode 100644
index 0000000..372c2f2
Binary files /dev/null and b/public/designs/themes/aluminium/preview.png differ
diff --git a/public/designs/themes/butter/preview.png b/public/designs/themes/butter/preview.png
new file mode 100644
index 0000000..ee584fb
Binary files /dev/null and b/public/designs/themes/butter/preview.png differ
diff --git a/public/designs/themes/chameleon/preview.png b/public/designs/themes/chameleon/preview.png
new file mode 100644
index 0000000..e5bd0e1
Binary files /dev/null and b/public/designs/themes/chameleon/preview.png differ
diff --git a/public/designs/themes/chocolate/preview.png b/public/designs/themes/chocolate/preview.png
new file mode 100644
index 0000000..d62c9e8
Binary files /dev/null and b/public/designs/themes/chocolate/preview.png differ
diff --git a/public/designs/themes/chocolate/preview.xcf b/public/designs/themes/chocolate/preview.xcf
new file mode 100644
index 0000000..7b2e453
Binary files /dev/null and b/public/designs/themes/chocolate/preview.xcf differ
diff --git a/public/designs/themes/noosfero/preview.png b/public/designs/themes/noosfero/preview.png
new file mode 100644
index 0000000..74840bc
Binary files /dev/null and b/public/designs/themes/noosfero/preview.png differ
diff --git a/public/designs/themes/noosfero/preview.xcf b/public/designs/themes/noosfero/preview.xcf
new file mode 100644
index 0000000..d035f23
Binary files /dev/null and b/public/designs/themes/noosfero/preview.xcf differ
diff --git a/public/designs/themes/orange/preview.png b/public/designs/themes/orange/preview.png
new file mode 100644
index 0000000..b3bb2d4
Binary files /dev/null and b/public/designs/themes/orange/preview.png differ
diff --git a/public/designs/themes/plum/preview.png b/public/designs/themes/plum/preview.png
new file mode 100644
index 0000000..18ebb82
Binary files /dev/null and b/public/designs/themes/plum/preview.png differ
diff --git a/public/designs/themes/scarletred/preview.png b/public/designs/themes/scarletred/preview.png
new file mode 100644
index 0000000..48e0448
Binary files /dev/null and b/public/designs/themes/scarletred/preview.png differ
diff --git a/public/designs/themes/skyblue/preview.png b/public/designs/themes/skyblue/preview.png
new file mode 100644
index 0000000..4d1ab0f
Binary files /dev/null and b/public/designs/themes/skyblue/preview.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ace8bba..70da224 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -4071,6 +4071,15 @@ h1#agenda-title {
 
 /* ==> public/stylesheets/controller_themes.css <== */
 /* common stuff */
+
+.controller-themes .template-preview-cell {
+  text-align: center;
+}
+
+.controller-themes .theme-preview {
+  border: 1px solid #BBB;
+}
+
 .controller-themes #css-files-list h2,
 .controller-themes #image-files-list h2 {
   margin-top: 0px;
--
libgit2 0.21.2