diff --git a/plugins/context_content/public/style.css b/plugins/context_content/public/style.css
index d9a161e..3e2c58a 100644
--- a/plugins/context_content/public/style.css
+++ b/plugins/context_content/public/style.css
@@ -1,16 +1,22 @@
 .context-content-block .contents .item img {
   width: 100%;
+  max-height: 60px;
+}
+
+.context-content-block .contents .item .image {
+  height: 60px;
 }
 
 .context-content-block .contents .item .context-icon {
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center; 
-  height: 60px;
+  height: 100%;
 }
 
 .context-content-block .contents .item {
   width: 60px;
+  height: 95px;
   display: inline-block;
   vertical-align: top;
   margin: 5px;
@@ -36,3 +42,14 @@
 .context-content-block .contents .item a {
   text-decoration: none;
 }
+
+#content .context-content-block .contents .item .icon-text-html { background-image: url(/designs/icons/default/Tango/32x32/mimetypes/text-html.png) }
+#content .context-content-block .contents .item .icon-application-pdf { background-image: url(/designs/icons/default/Tango/32x32/mimetypes/gnome-mime-application-pdf.png) }
+#content .context-content-block .contents .item .icon-application-vnd-oasis-opendocument-text { background-image: url(/designs/icons/default/Tango/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
+#content .context-content-block .contents .item .icon-folder { background-image: url(/designs/icons/default/Tango/32x32/places/folder.png) }
+#content .context-content-block .contents .item .icon-text-plain { background-image: url(/designs/icons/default/Tango/32x32/mimetypes/text-x-generic.png) }
+#content .context-content-block .contents .item .icon-blog { background-image: url(/designs/icons/default/mod/32x32/apps/text-editor.png) }
+#content .context-content-block .contents .item .icon-forum { background-image: url(/designs/icons/default/Tango/32x32/apps/system-users.png) }
+#content .context-content-block .contents .item .icon-gallery { background-image: url(/designs/icons/default/Tango/32x32/mimetypes/image-x-generic.png) }
+#content .context-content-block .contents .item .icon-rss-feed { background-image: url(/images/icons-mime/rss-feed.png) }
+#content .context-content-block .contents .item .icon-event { background-image: url(/designs/icons/default/Tango/32x32/mimetypes/stock_calendar.png) }
diff --git a/plugins/context_content/views/blocks/context_content.rhtml b/plugins/context_content/views/blocks/context_content.rhtml
index 5dbcf74..19b2e0f 100644
--- a/plugins/context_content/views/blocks/context_content.rhtml
+++ b/plugins/context_content/views/blocks/context_content.rhtml
@@ -4,9 +4,11 @@
 <% contents.each do |content| %>
   <span class="item">
     <a href="<%= url_for(content.view_url) %>">
-      <%= instance_eval(&block.content_image(content)) if block.show_image %>
+      <div class="image">
+        <%= instance_eval(&block.content_image(content)) if block.show_image %>
+      </div>
       <% if block.show_name %>
-        <div class="name"><%= short_filename(content.name) %></div>
+        <div class="name"><%= short_filename(content.name, 30) %></div>
       <% end %>
     </a>
   </span>
--
libgit2 0.21.2