diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 6e7370a338..a0c3c2cc4b 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -866,8 +866,9 @@ public class BrowseBean implements IContextListener
    
    public NodePropertyResolver resolverSmallIcon = new NodePropertyResolver() {
       public Object get(Node node) {
-         // TODO: add support for different small space icons
-         return SPACE_SMALL_DEFAULT;
+         QNameNodeMap props = (QNameNodeMap)node.getProperties();
+         String icon = (String)props.getRaw("app:icon");
+         return (icon != null ? icon + "-16" : SPACE_SMALL_DEFAULT);
       }
    };
    
diff --git a/source/web/images/icons/space-icon-cd-16.gif b/source/web/images/icons/space-icon-cd-16.gif
new file mode 100644
index 0000000000..c62b209eb9
Binary files /dev/null and b/source/web/images/icons/space-icon-cd-16.gif differ
diff --git a/source/web/images/icons/space-icon-default-16.gif b/source/web/images/icons/space-icon-default-16.gif
new file mode 100644
index 0000000000..25f3f06670
Binary files /dev/null and b/source/web/images/icons/space-icon-default-16.gif differ
diff --git a/source/web/images/icons/space-icon-doc-16.gif b/source/web/images/icons/space-icon-doc-16.gif
new file mode 100644
index 0000000000..0491da0c38
Binary files /dev/null and b/source/web/images/icons/space-icon-doc-16.gif differ
diff --git a/source/web/images/icons/space-icon-image-16.gif b/source/web/images/icons/space-icon-image-16.gif
new file mode 100644
index 0000000000..d22916b3a2
Binary files /dev/null and b/source/web/images/icons/space-icon-image-16.gif differ
diff --git a/source/web/images/icons/space-icon-pen-16.gif b/source/web/images/icons/space-icon-pen-16.gif
new file mode 100644
index 0000000000..19938bac97
Binary files /dev/null and b/source/web/images/icons/space-icon-pen-16.gif differ
diff --git a/source/web/images/icons/space-icon-star-16.gif b/source/web/images/icons/space-icon-star-16.gif
new file mode 100644
index 0000000000..acb4beac34
Binary files /dev/null and b/source/web/images/icons/space-icon-star-16.gif differ