diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 212a2881cf2..c155b01af76 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -65,21 +65,28 @@
 
               <kanban>
                   <field name="icon"/>
+                  <field name="name"/>
                   <field name="state"/>
+                  <field name="complexity"/>
                   <templates>
-                      <t t-name="kanban-box">
-                        <img t-if="record.icon.value" src="#{record.icon.value}.png" class="module-icon"/>
-                        <img t-if="!record.icon.value" src="/web/static/src/img/header-preferences.png" class="module-icon"/>
-                        <div class="module-desc">
-                          <h4><field name="shortdesc"/></h4>
-                          <p>
-                             <field name="category_id"/><br/>
-                             Complexity: <field name="complexity"/>
-                           </p>
-                          <a type="object" name="button_install" states="uninstalled" class="button">Install</a>
-                          <button t-if="record.state.raw_value == 'installed'" class="label" disabled="disabled">Installed</button>
-                        </div>
-                      </t>
+                    <t t-name="kanban-box">
+                      <a type="edit"> 
+                        <img t-attf-src="/#{record.name.value}/static/images/icon.png" class="oe_module_icon"/>
+                      </a>
+                      <div class="oe_module_desc">
+                        <h4><a type="edit"><field name="shortdesc"/></a></h4>
+                        <p>
+                           <field name="category_id"/><br/>
+                           <span t-if="record.complexity.raw_value == 'Expert'" class="oe_label oe_warning">Complex</span>
+                         </p>
+                        <a type="object" name="button_install" states="uninstalled" class="button">Install</a>
+                        <button t-if="record.state.raw_value == 'installed'" class="label" disabled="disabled">Installed</button>
+                      </div>
+                      <script>
+                        $('.oe_module_icon').error(function() { $(this).attr('src', "/base/static/src/img/kanban_partner.png"); });
+                        $('a .oe_module_icon').error(function() { $(this).attr('src', "/base/static/src/img/kanban_partner.png"); });
+                      </script>
+                    </t>
                   </templates>
               </kanban>
 
diff --git a/openerp/addons/base/static/src/css/modules.css b/openerp/addons/base/static/src/css/modules.css
index 645a332bc46..3b525679be1 100644
--- a/openerp/addons/base/static/src/css/modules.css
+++ b/openerp/addons/base/static/src/css/modules.css
@@ -1,31 +1,39 @@
-.module-icon, .module-desc {
+.oe_module_icon, .oe_module_desc {
   display: inline-block;
   vertical-align: top;
 }
 
-.module-icon {
+.oe_module_icon {
   width: 80px;
   height: 80px;
-  padding: 0 4px;
+  padding: 4px;
 }
 
-.module-desc {
+.oe_module_desc {
   width: 220px;
   font-size: 13px;
   padding: 2px 4px 8px;
   color: #4c4c4c;
 }
 
-.module-desc h4 {
-  margin: 3px 0;
+.oe_module_desc h4 {
+  margin: 0;
   font-size: 13px;
 }
 
-.module-desc p {
+.oe_module_desc h4 a {
+  color: #4c4c4c;
+}
+
+.oe_module_desc h4 a:hover {
+  text-decoration: underline;
+}
+
+.oe_module_desc p {
   margin: 3px 0 5px;
 }
 
 .oe_kanban_record {
   margin: 5px 0;
-  min-height: 80px;
+  min-height: 100px;
 }
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 09fcb2e9a0a..d35ca743bd3 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -251,7 +251,7 @@ def load_information_from_description_file(module):
             info.setdefault('description', '')
             info.setdefault('complexity', 'normal')
             info.setdefault('core', False)
-            info.setdefault('icon', '')
+            info.setdefault('icon', 'images/icon.png')
             info['certificate'] = info.get('certificate') or None
             info['web'] = info.get('web') or False
             info['license'] = info.get('license') or 'AGPL-3'