diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config
index dd900f1a0..a2d69a7b9 100644
--- a/src/Orchard.Web/Themes/Web.config
+++ b/src/Orchard.Web/Themes/Web.config
@@ -2,8 +2,9 @@
 <configuration>
   <system.web>
     <httpHandlers>
+        <!-- iis6 - for any request in this location, return via managed static file handler -->
+        <add path="*/Theme.png" verb="*" type="System.Web.StaticFileHandler" />
     </httpHandlers>
-
     <!--
         Enabling request validation in view pages would cause validation to occur
         after the input has already been processed by the controller. By default
@@ -24,7 +25,12 @@
 
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
-    <handlers>
+    <handlers accessPolicy="Script,Read">
+        <!--
+        iis7 - for any request to a file exists on disk, return it via native http module.
+        accessPolicy 'Script' is to allow for a managed 404 page.
+        -->
+        <add name="StaticFile" path="*/Theme.png" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
     </handlers>
   </system.webServer>
   <runtime>