diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
index c7b0fefa8f..40a11f5843 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
@@ -63,6 +63,7 @@
                <div class="docIcon">
                   <a href="${url.context}${d.url}" target="new"><img class="docIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border=0></a>
                </div>
+               <div style="display:none"><img class="docIconImage64" alt="" width="64" height="64" src="${url.context}${d.icon64}"></div>
                <div class="docItem">
                   ${d.name?html}
                   <span class="docInfo" onclick="event.cancelBubble=true; AlfNodeInfoMgr.toggle('${d.nodeRef}',this);">
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl
index 1ac8198d53..9e0f86cc55 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl
@@ -83,6 +83,7 @@
                <#else>
                   <a href="${scripturl("?f=${filter}&p=${path}/${d.name}")}"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border=0></a>
                </#if>
+               <div style="display:none"><img class="spaceIconImage64" alt="" width="64" height="64" src="${url.context}${d.icon64}"></div>
             </div>
             <div class="spaceItem">
                ${d.name?html}
diff --git a/source/web/images/filetypes/_default.gif b/source/web/images/filetypes/_default.gif
index ac51964908..9d37b6a145 100644
Binary files a/source/web/images/filetypes/_default.gif and b/source/web/images/filetypes/_default.gif differ
diff --git a/source/web/images/filetypes/_default.png b/source/web/images/filetypes/_default.png
new file mode 100644
index 0000000000..59b46b32cf
Binary files /dev/null and b/source/web/images/filetypes/_default.png differ
diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js
index 12305c8aa6..a73b4e0e3b 100644
--- a/source/web/scripts/ajax/doclist.js
+++ b/source/web/scripts/ajax/doclist.js
@@ -17,6 +17,7 @@ var MyDocs = {
       var details = $$('#docPanel .docDetail');
       var icons = $$('#docPanel .docIcon');
       var imgs = $$('#docPanel .docIconImage');
+      var imgs64 = $$('#docPanel .docIconImage64');
       var resources = $$('#docPanel .docResource');
       var fxItem = new Fx.Elements(items, {wait: false, duration: 300, transition: Fx.Transitions.linear});
       var fxDetail = new Fx.Elements(details, {wait: false, duration: 300, transition: Fx.Transitions.linear});
@@ -82,11 +83,16 @@ var MyDocs = {
          detail.setStyle('display', 'block');
          detail.setStyle('height', detail.defHeight);
          info.setStyle('opacity', 0);
+         // NOTE: special check for images without special 64x64 pixel version
+         if (imgs64[i].src.lastIndexOf("_default.png") != -1)
+         {
+            img.src = img.src.replace(new RegExp("/filetypes/.*\.png$"), "/filetypes/_default.png");
+         }
          img.defSrc = img.src;
-         img.bigSrc = img.src.replace(/filetypes\//, 'filetypes64/').replace(/.gif$/, '.png');
+         img.bigSrc = imgs64[i].src;
          resource.defHeight = 1;
          resource.setStyle('height', resource.defHeight);
-
+         
          // register 'mouseenter' (subclassed mouseover) event for each doc
          doc.addEvent('mouseenter', function(e)
          {
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index 46f0a48f7a..96c20b3e06 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -17,6 +17,7 @@ var MySpaces = {
       var details = $$('#spacePanel .spaceDetail');
       var icons = $$('#spacePanel .spaceIcon');
       var imgs = $$('#spacePanel .spaceIconImage');
+      var imgs64 = $$('#spacePanel .spaceIconImage64');
       var fxItem = new Fx.Elements(items, {wait: false, duration: 300, transition: Fx.Transitions.linear});
       var fxDetail = new Fx.Elements(details, {wait: false, duration: 300, transition: Fx.Transitions.linear});
       var fxInfo = new Fx.Elements(infos, {wait: false, duration: 300, transition: Fx.Transitions.linear});
@@ -51,16 +52,14 @@ var MySpaces = {
          detail.setStyle('display', 'block');
          detail.setStyle('height', detail.defHeight);
          info.setStyle('opacity', 0);
+         // NOTE: special check for images without special 64x64 pixel version
+         if (imgs64[i].src.lastIndexOf("_default.png") != -1)
+         {
+            img.src = img.src.replace(new RegExp("/filetypes/.*\.png$"), "/filetypes/_default.png");
+         }
          img.defSrc = img.src;
-         if (img.src.indexOf("/filetypes/") != -1)
-         {
-            img.bigSrc = img.src.replace(/filetypes\//, 'filetypes64/');
-         }
-         else
-         {
-            img.bigSrc = img.src.replace(/16.png$/, '64.png');
-         }
-
+         img.bigSrc = imgs64[i].src;
+         
          // register 'mouseenter' (subclassed mouseover) event for each space
          space.addEvent('mouseenter', function(e)
          {