diff --git a/odoo/addons/base/models/ir_module.py b/odoo/addons/base/models/ir_module.py
index 1305833fac7..6f304e70c77 100644
--- a/odoo/addons/base/models/ir_module.py
+++ b/odoo/addons/base/models/ir_module.py
@@ -233,7 +233,7 @@ class Module(models.Model):
                 path_parts = module.icon.split('/')
                 path = modules.get_module_resource(path_parts[1], *path_parts[2:])
             elif module.id:
-                path = modules.module.get_module_icon(module.name)
+                path = modules.module.get_module_icon_path(module)
             else:
                 path = ''
             if path:
diff --git a/odoo/modules/module.py b/odoo/modules/module.py
index 48ba5d0f752..824eed7e16d 100644
--- a/odoo/modules/module.py
+++ b/odoo/modules/module.py
@@ -245,6 +245,13 @@ def get_module_icon(module):
         return ('/' + module + '/') + '/'.join(iconpath)
     return '/base/'  + '/'.join(iconpath)
 
+def get_module_icon_path(module):
+    iconpath = ['static', 'description', 'icon.png']
+    path = get_module_resource(module.name, *iconpath)
+    if not path:
+        path = get_module_resource('base', *iconpath)
+    return path
+
 def module_manifest(path):
     """Returns path to module manifest if one can be found under `path`, else `None`."""
     if not path: