diff --git a/public/images/favicon-96x96-notification.png b/public/images/favicon-96x96-notification.png
new file mode 100644
index 0000000..d3407c3
Binary files /dev/null and b/public/images/favicon-96x96-notification.png differ
diff --git a/public/index.html b/public/index.html
index bbb4308..9fc34e5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -25,7 +25,7 @@
     <meta name="twitter:description" content="Instantly share images, videos, PDFs, and links with people nearby. Peer2Peer and Open Source. No Setup, No Signup.">
     <meta name="og:description" content="Instantly share images, videos, PDFs, and links with people nearby. Peer2Peer and Open Source. No Setup, No Signup.">
     <!-- Icons -->
-    <link rel="icon" sizes="96x96" href="images/favicon-96x96.png">
+    <link rel="icon" id="favicon" sizes="96x96" href="images/favicon-96x96.png">
     <link rel="shortcut icon" href="images/favicon-96x96.png">
     <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
     <meta name="msapplication-TileImage" content="images/mstile-150x150.png">
diff --git a/public/scripts/ui.js b/public/scripts/ui.js
index ac5f72e..40b5845 100644
--- a/public/scripts/ui.js
+++ b/public/scripts/ui.js
@@ -403,7 +403,6 @@ class PeerUI {
     }
 }
 
-
 class Dialog {
     constructor(id, hideOnDisconnect = true) {
         this.$el = $(id);
@@ -423,6 +422,8 @@ class Dialog {
             document.activeElement.blur();
             window.blur();
         }
+        document.title = 'PairDrop';
+        document.getElementById('favicon').href = "images/favicon-96x96.png";
     }
 }
 
@@ -572,7 +573,9 @@ class ReceiveFileDialog extends ReceiveDialog {
         }
 
         this.createPreviewElement(files[0]).then(_ => {
-            this.show()
+            document.title = `PairDrop - ${files.length} Files received`;
+            document.getElementById('favicon').href = "images/favicon-96x96-notification.png";
+            this.show();
             Events.fire('set-progress', {
                 peerId: peerId,
                 progress: 1,
@@ -594,7 +597,7 @@ class ReceiveFileDialog extends ReceiveDialog {
 class ReceiveRequestDialog extends ReceiveDialog {
 
     constructor() {
-        super('receiveRequestDialog', true);
+        super('receiveRequestDialog');
 
         this.$acceptRequestBtn = this.$el.querySelector('#acceptRequest');
         this.$declineRequestBtn = this.$el.querySelector('#declineRequest');
@@ -644,6 +647,8 @@ class ReceiveRequestDialog extends ReceiveDialog {
             this.$previewBox.appendChild(element)
         }
 
+        document.title = 'PairDrop - File Transfer Requested';
+        document.getElementById('favicon').href = "images/favicon-96x96-notification.png";
         this.show()
     }
 
@@ -980,6 +985,8 @@ class ReceiveTextDialog extends Dialog {
         } else {
             this.$text.textContent = text;
         }
+        document.title = 'PairDrop - Message Received';
+        document.getElementById('favicon').href = "images/favicon-96x96-notification.png";
         this.show();
         window.blop.play();
     }