diff --git a/fields/file.py b/fields/file.py
index 95356ea..e61dc0f 100644
--- a/fields/file.py
+++ b/fields/file.py
@@ -400,7 +400,7 @@ class File(Field):
             if rq: action = rq.get('%s_delete' % self.name, None)
             if action != 'nochange':
                 # Delete the file on disk
-                info = getattr(zobj.aq_base, self.name)
+                info = getattr(zobj.aq_base, self.name, None)
                 if info:
                     info.removeFile(zobj.getDbFolder(), removeEmptyFolders=True)
                 # Delete the FileInfo in the DB
diff --git a/gen/mixins/ToolMixin.py b/gen/mixins/ToolMixin.py
index 57b92c6..df53255 100644
--- a/gen/mixins/ToolMixin.py
+++ b/gen/mixins/ToolMixin.py
@@ -1243,9 +1243,8 @@ class ToolMixin(BaseMixin):
         tb = sys.exc_info()
         if error.type.__name__ == 'Unauthorized':
             siteUrl = self.getSiteUrl()
-            htmlMessage = '<a href="%s"><img src="%s/ui/home.gif"/></a>' \
-                          'You are not allowed to access this page.' % \
-                          (siteUrl, siteUrl)
+            htmlMessage = '<a href="/">Back</a> You are not allowed to ' \
+                          'access this page.'
             userId = self.appy().user.login
             textMessage = 'Unauthorized for %s @%s.' % \
                           (userId, self.REQUEST.get('PATH_INFO'))
diff --git a/gen/ui/home.gif b/gen/ui/home.gif
deleted file mode 100644
index c203753..0000000
Binary files a/gen/ui/home.gif and /dev/null differ
diff --git a/gen/wrappers/__init__.py b/gen/wrappers/__init__.py
index 93a88bc..ce56bf2 100644
--- a/gen/wrappers/__init__.py
+++ b/gen/wrappers/__init__.py
@@ -150,16 +150,15 @@ class AbstractWrapper(object):
        <tr class="top">
         <!-- Top banner -->
         <td var="bannerName=(dir == 'ltr') and 'banner' or 'bannerrtl'"
-            style=":url(bannerName, bg=True) + '; background-repeat:no-repeat'">
+            style=":url(bannerName, bg=True) + '; background-repeat:no-repeat;\
+                   position:relative'">
+         <!-- Logo (transparent clickable zone by default) -->
+         <div align=":dleft" style="position: absolute"><a href="/">
+          <img src=":url('logo')"/></a></div>
 
          <!-- Top links -->
          <div style="margin-top: 4px" align=":dright">
-          <!-- Icon "home" -->
-          <a class="pageLink" href="/" title=": _('app_home')">
-           <img src=":url('home.gif')" style="margin-right: 3px"/>
-          </a>
-
-          <!-- Additional links -->
+          <!-- Custom links -->
           <x>:tool.pxLinks</x>
 
           <!-- Top-level pages -->