                 docIconButton.vCenter(titleView)
             }
             
-            if let doc = self.doc {
-                 docIconButton.image = doc.displayImage.resize(w: 12, h: 12)
+            if let url = self.webView?.url, !url.isFileURL {
+                docIconButton.isHidden = true
             }
             else
             {
-                 docIconButton.image = NSApp.applicationIconImage.resize(w: 12, h: 12)
-            }
-
-            if autoHideTitlePreference == .outside {
-                docIconButton.isHidden = !mouseWasOver
-            }
-            else
-            {
-                docIconButton.isHidden = false
-                if let url = self.webView?.url, url.isFileURL {
-                    self.synchronizeWindowTitleWithDocumentName()
+                if let doc = self.doc {
+                     docIconButton.image = doc.displayImage.resize(w: 12, h: 12)
                 }
-            }
-        }
-        cacheSettings()
+                else
+                {
+                     docIconButton.image = NSApp.applicationIconImage.resize(w: 12, h: 12)
+                }
+
+                if autoHideTitlePreference == .outside {
+                    docIconButton.isHidden = !mouseWasOver
+                }
+                else
+                {
+                    docIconButton.isHidden = false
+                    if let url = self.webView?.url, url.isFileURL {
+                        self.synchronizeWindowTitleWithDocumentName()
+                    }
+                }
+            }
+        }
     }
     
     @objc func updateTitleBar(didChange: Bool) {
-        
-        if let url = window?.representedURL, !url.isFileURL, url.absoluteString != UserSettings.HomePageURL.value {
-            
+        let mouseSeen = mouseOver && !mouseIdle
+
+         if didChange {
             NSAnimationContext.runAnimationGroup({ (context) in
-                context.duration = 0.1
-
-                panel.animator().titleVisibility = .hidden
-                titleDragButton?.animator().isTransparent = true
-                titleDragButton?.animator().isBordered = false
-                if let docIconButton = panel.standardWindowButton(.documentIconButton) {
-                    docIconButton.animator().isHidden = true
+                context.duration = mouseIdle ? 1.0 : 0.2
+
+                if autoHideTitlePreference == .outside {
+                    panel.animator().titleVisibility = mouseSeen ? .visible : .hidden
+                    titleDragButton?.animator().isHidden = !mouseSeen
+                    if let url = panel.representedURL, !url.isFileURL, url.absoluteString != UserSettings.HomePageURL.value {
+                        titleDragButton?.animator().layer?.backgroundColor = mouseSeen ? NSColor(hex: 0x3399FF).cgColor : NSColor.clear.cgColor
+                    } else {
+                        titleDragButton?.animator().layer?.backgroundColor = NSColor.clear.cgColor
+                    }
+                    titleDragButton?.animator().isBordered = mouseSeen
+                    titleDragButton?.animator().isTransparent = !mouseSeen
                 }
-            })
-            return
-        }
-        
-        if didChange {
-            NSAnimationContext.runAnimationGroup({ (context) in
-                context.duration = 0.1
-
-                if autoHideTitlePreference != .never && !mouseOver {
-                    panel.animator().titleVisibility = .hidden
-                    titleView?.animator().isHidden = true
-                    titleDragButton?.animator().isTransparent = true
-                    titleDragButton?.animator().isBordered = false
-                } else {
+                else
+                {
                     panel.animator().titleVisibility = .visible
-                    titleView?.animator().isHidden = false
+                    titleDragButton?.animator().isHidden = false
+                    if let url = panel.representedURL, !url.isFileURL, url.absoluteString != UserSettings.HomePageURL.value {
+                        titleDragButton?.animator().layer?.backgroundColor = mouseSeen ? NSColor(hex: 0x3399FF).cgColor : NSColor.clear.cgColor
+                    } else {
+                        titleDragButton?.animator().layer?.backgroundColor = NSColor.clear.cgColor
+                    }
+                    titleDragButton?.animator().isBordered = true
                     titleDragButton?.animator().isTransparent = false
-                    titleDragButton?.animator().isBordered = true
                 }
+
             })
         }
         docIconVisibility(autoHideTitlePreference == .never || translucencyPreference == .never)

    @objc @IBAction func autoHideTitlePress(_ sender: NSMenuItem) {
        guard autoHideTitlePreference.rawValue != sender.tag else { return }
        
        let newTitlePref = HeliumPanelController.AutoHideTitlePreference(rawValue: sender.tag)!

        //  Make sure queue affects are immediately effective
        NSAnimationContext.runAnimationGroup({ (context) in
            let outside = autoHideTitlePreference == .outside
            context.duration = 0.1

            titleDragButton?.animator().isTransparent = !outside
            titleDragButton?.animator().isBordered = outside
        })

        //  Presume false so our action result is immediate
        autoHideTitlePreference = newTitlePref
        updateTitleBar(didChange: true)
        cacheSettings()
    }

        titleDragButton?.title = ""
 
        NSAnimationContext.runAnimationGroup({ (context) in
            context.duration = mouseIdle ? 1.0 : 0.2

            panel.animator().titleVisibility = (autoHideTitlePreference != .never) ? mouseOver ? .visible : .hidden : .visible
            titleDragButton?.animator().layer?.backgroundColor = mouseOver ? NSColor(hex: 0x3399FF).cgColor : NSColor.clear.cgColor
