diff --git a/src/images/close.png b/src/images/close.png
new file mode 100644
index 0000000000..ccbb3b1d5c
Binary files /dev/null and b/src/images/close.png differ
diff --git a/src/manifest.json b/src/manifest.json
index 316a943203..15b78418a6 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -128,7 +128,10 @@
     }
   },
   "web_accessible_resources": [
-    "notification/bar.html"
+    "notification/bar.html",
+    "images/icon38.png",
+    "images/icon38_locked.png",
+    "images/close.png"
   ],
   "applications": {
     "gecko": {
diff --git a/src/notification/bar.html b/src/notification/bar.html
index 0b0b29417c..5c82a4e4d3 100644
--- a/src/notification/bar.html
+++ b/src/notification/bar.html
@@ -10,22 +10,14 @@
     <div class="outer-wrapper">
         <div class="logo">
             <a href="https://vault.bitwarden.com" target="_blank" id="logo-link">
-                <img id="logo" alt="Bitwarden"
-                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAACXBIWXMAAAsTAAALEwEAmpwYAAALr2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDUgNzkuMTYzNDk5LCAyMDE4LzA4LzEzLTE2OjQwOjIyICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMjAtMDItMjRUMDQ6MzgtMDc6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDIwLTA1LTIyVDEzOjUyOjE2LTA2OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDIwLTA1LTIyVDEzOjUyOjE2LTA2OjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOmVhNjYxOTBhLTM3NjgtNGMzZS1hZDc4LTU0OTZlNGU3YWU4MyIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOmZhMzVhOTg5LTcwODUtOGU0Zi1iMDFlLTcwZjUwYzkyNWUxMCIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjY3NGZmNzMyLTMyYmQtNDg2OS1iNTg4LWYwNzk1OGZjY2U0ZSIgdGlmZjpPcmllbnRhdGlvbj0iMSIgdGlmZjpYUmVzb2x1dGlvbj0iNzIwMDAwLzEwMDAwIiB0aWZmOllSZXNvbHV0aW9uPSI3MjAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjM4IiBleGlmOlBpeGVsWURpbWVuc2lvbj0iMzgiPiA8cGhvdG9zaG9wOkRvY3VtZW50QW5jZXN0b3JzPiA8cmRmOkJhZz4gPHJkZjpsaT5hZG9iZTpkb2NpZDpwaG90b3Nob3A6ZDU0Mjg3MjAtMjc0NS1kZTRjLWE1MTMtZTY5ZTg1MzJjYmFkPC9yZGY6bGk+IDwvcmRmOkJhZz4gPC9waG90b3Nob3A6RG9jdW1lbnRBbmNlc3RvcnM+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6Njc0ZmY3MzItMzJiZC00ODY5LWI1ODgtZjA3OTU4ZmNjZTRlIiBzdEV2dDp3aGVuPSIyMDIwLTAyLTI0VDA0OjM4LTA3OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoTWFjaW50b3NoKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGltYWdlL3BuZyB0byBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo0MGFmNDQzYi1iZWUzLTQwOGQtYjY2My04ZmVhMTNmMDJjZGUiIHN0RXZ0OndoZW49IjIwMjAtMDUtMTRUMjM6MzY6NTQtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDoyZmVjMjY3YS1hNTE4LTQ0NjgtODYxNC0wNTliMmE3ZGI1NzYiIHN0RXZ0OndoZW49IjIwMjAtMDUtMjJUMTM6NTI6MTYtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjb252ZXJ0ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImZyb20gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCB0byBpbWFnZS9wbmciLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImRlcml2ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImNvbnZlcnRlZCBmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDplYTY2MTkwYS0zNzY4LTRjM2UtYWQ3OC01NDk2ZTRlN2FlODMiIHN0RXZ0OndoZW49IjIwMjAtMDUtMjJUMTM6NTI6MTYtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyZmVjMjY3YS1hNTE4LTQ0NjgtODYxNC0wNTliMmE3ZGI1NzYiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDpkNTQyODcyMC0yNzQ1LWRlNGMtYTUxMy1lNjllODUzMmNiYWQiIHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo2NzRmZjczMi0zMmJkLTQ4NjktYjU4OC1mMDc5NThmY2NlNGUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz76ntJHAAADO0lEQVRYhe2XTUzTYBjH/223wdatusHC+MiMiHAwwZD4ERKNXwcPaAJ60IAag1yIFwNGTNQQD5iYCBdOJgY9qAEVMQoxRowxKDt5QGIkxi/QjI9ua7au68bW1QsTCFlpxwAP+x3fPu///eXt2ydviT3tg0ggBrP3cSzTFBayKqUYZccaQOkkNpuOuKz2QIfRHH73b9x5+AzkOGH0um03Z/7k3I5G9GVynKTXQgoA5DhJRyP6soDPfFaWSMZoDg8RBGI6AJj+nXuH5+jatZJJBscyTbEY5XBsYutIIWCs+h+kEvAcXSsEjFU6v4dpTFb0oDkfh7abVk3izUgIde2TS8b9HqaRDAtZlckmrqaUUn44ZNhFShJpW9XVU0CKUXZdOgMfvefRPcQr1uwuzUbL8eX3Iq1iE2wMw19ExZoNJlJVlrqqdSAjppWMmFYyYlrJiGklI6aVNRejSEJVnaKYJyClRWYhzgUXGqV8RbGRn5H0Gc1xdJdZVb6i2MuPQvqMABwsN6GiOEtVvqJY7zAPLpie15ljodBeP/+rygUl9A4nv1QqiomzMm71cSuWMhoI3LvgQL5t/ny1P+MgzsqpiQHA3UE/XGPKt1IlbBYKjy8XYOfW7H9jrjERXa/9ivOWFYvLQEPnNH7NRDVLlRYa8OJaIXaUzEv9momioXMa8eSbpU4MALy8hJobbk1ytfsYvLpehC0O/SKpmhtuePnlz63qBjvpi6G6zY3RceUWsjlPj55LBeg4Z4fRMN9MR8cjqG5zY9IXU7UekXf62zKbuhhTFolb9XYcqzQvefZ9KgqnXQc9tbi7P3UFcbGLRSgSV72OZrEENZVmtJ3Khc1CJa3x8RKu3PegzxXUnE8UnP3qTfVv3Gqm0HoyByf2WkAs2CRZBnqGeFzv9qbUBymdxBLF50f7hYCxKhWxBNucBrQct+FAuQlvP4Vws9eHzxOzKefRG0LPiYrWD1XuH3n9KxFLN0UlU/tJmhEHzBuFJ+stk8BqD3QIftM7HQA4nJ4zXr00wbFM03pKWazCw5x87iow18cIUhZzC33NRSVT+2lGHCDJuPbPKEUoncTSjDhQUDx9xGIN1gEQAeAvxlojmuySo/gAAAAASUVORK5CYII=" />
+                <img id="logo" alt="Bitwarden" />
             </a>
         </div>
         <div id="content"></div>
         <div>
-<<<<<<< HEAD
-            <a href="#" id="close-button">
-                <img id="close" alt="X"
-                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeBAMAAADJHrORAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAABJQTFRFAAAAMzMzMzMzMzMzMzMzMzMzbxxq5QAAAAZ0Uk5TAECg/2CfwOuXQgAAAJVJREFUeJxVkdEJwzAMRNXgAQpZINAu0Fz7b3AHyP7T1MrppNQfMuI9sE42s7vp3Lws7+zHMcsDPdqGz8SAhAEctgIhNDhiDYyNVw+8p5ZYgrCExBS+iSmgMIXCEhJTKMy+Yobf//BF0Hv9gp8lcPKRAifPPSiYBAULoXJTWHNyJy/f917vbv4fCtZOslSwcZLKMf/zB2MLKtNp5GuwAAAAAElFTkSuQmCC" />
-            </a>
-=======
             <button type="button" class="neutral" id="close-button">
-                <img id="close" alt="X" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeBAMAAADJHrORAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAABJQTFRFAAAAMzMzMzMzMzMzMzMzMzMzbxxq5QAAAAZ0Uk5TAECg/2CfwOuXQgAAAJVJREFUeJxVkdEJwzAMRNXgAQpZINAu0Fz7b3AHyP7T1MrppNQfMuI9sE42s7vp3Lws7+zHMcsDPdqGz8SAhAEctgIhNDhiDYyNVw+8p5ZYgrCExBS+iSmgMIXCEhJTKMy+Yobf//BF0Hv9gp8lcPKRAifPPSiYBAULoXJTWHNyJy/f917vbv4fCtZOslSwcZLKMf/zB2MLKtNp5GuwAAAAAElFTkSuQmCC" />
+                <img id="close" alt="X" />
             </button>
->>>>>>> a3876db30bdfb5ac42bda44ec02a728a52ae149c
         </div>
     </div>
     <div id="templates" style="display: none;">
diff --git a/src/notification/bar.js b/src/notification/bar.js
index 77ac3e7447..6d0eada312 100644
--- a/src/notification/bar.js
+++ b/src/notification/bar.js
@@ -16,15 +16,16 @@ document.addEventListener('DOMContentLoaded', () => {
     i18n.notificationChangeDesc = chrome.i18n.getMessage('notificationChangeDesc');
     lang = chrome.i18n.getUILanguage();
 
-    const lockedImage = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAACXBIWXMAAAsTAAALEwEAmpwYAAALr2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDUgNzkuMTYzNDk5LCAyMDE4LzA4LzEzLTE2OjQwOjIyICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMjAtMDItMjRUMDQ6MzgtMDc6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDIwLTA1LTIyVDEzOjUyOjQwLTA2OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDIwLTA1LTIyVDEzOjUyOjQwLTA2OjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjNmOWFlM2NjLTE3ZjAtNDY1MC05MmExLTk2MTY0NjE4NmY4OSIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOmZmYmI3ODM1LWM1ZDItZWE0Yy05MTQ5LWViNTBmNmIwNDBjOCIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjY3NGZmNzMyLTMyYmQtNDg2OS1iNTg4LWYwNzk1OGZjY2U0ZSIgdGlmZjpPcmllbnRhdGlvbj0iMSIgdGlmZjpYUmVzb2x1dGlvbj0iNzIwMDAwLzEwMDAwIiB0aWZmOllSZXNvbHV0aW9uPSI3MjAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjM4IiBleGlmOlBpeGVsWURpbWVuc2lvbj0iMzgiPiA8cGhvdG9zaG9wOkRvY3VtZW50QW5jZXN0b3JzPiA8cmRmOkJhZz4gPHJkZjpsaT5hZG9iZTpkb2NpZDpwaG90b3Nob3A6ZDU0Mjg3MjAtMjc0NS1kZTRjLWE1MTMtZTY5ZTg1MzJjYmFkPC9yZGY6bGk+IDwvcmRmOkJhZz4gPC9waG90b3Nob3A6RG9jdW1lbnRBbmNlc3RvcnM+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6Njc0ZmY3MzItMzJiZC00ODY5LWI1ODgtZjA3OTU4ZmNjZTRlIiBzdEV2dDp3aGVuPSIyMDIwLTAyLTI0VDA0OjM4LTA3OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoTWFjaW50b3NoKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGltYWdlL3BuZyB0byBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo0MGFmNDQzYi1iZWUzLTQwOGQtYjY2My04ZmVhMTNmMDJjZGUiIHN0RXZ0OndoZW49IjIwMjAtMDUtMTRUMjM6MzY6NTQtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpmZTY3NzRhNi05ZjZkLTQ3ZTMtODMwYS1kOWVjYzk4NmM5NGMiIHN0RXZ0OndoZW49IjIwMjAtMDUtMjJUMTM6NTI6NDAtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjb252ZXJ0ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImZyb20gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCB0byBpbWFnZS9wbmciLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImRlcml2ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImNvbnZlcnRlZCBmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDozZjlhZTNjYy0xN2YwLTQ2NTAtOTJhMS05NjE2NDYxODZmODkiIHN0RXZ0OndoZW49IjIwMjAtMDUtMjJUMTM6NTI6NDAtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpmZTY3NzRhNi05ZjZkLTQ3ZTMtODMwYS1kOWVjYzk4NmM5NGMiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDpkNTQyODcyMC0yNzQ1LWRlNGMtYTUxMy1lNjllODUzMmNiYWQiIHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo2NzRmZjczMi0zMmJkLTQ4NjktYjU4OC1mMDc5NThmY2NlNGUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7ege38AAAEQElEQVRYhe2YW2xURRjHfzNnd9vTXRe3tqblppQIEjEqRrCRSEATHyrBBuMDhMY0xgRfkAppYkI0REyMFB58ABNSnwRiCoQQkBgkCg2NCQSJGIMage260N1tj91Lt3s5Mz60bLnY7q2tPPBPTnLOzPf/5pczc+ZyxPKOU9xSMl65wgp724YTFY121qhlGmQ47HClO9Xjq43uMj3DP+bK577WglbC7A9WfxYKPPJlJuVcqJV0TwcUgFbSnUk5F0YHPG9rW3pNz/BZIcg6APp6a/bFLPe66YIZT1bY25bNGnV1j4XXy0TUbLofoG4pZrnXJaJmk2Mw4t04XtDXH9TzyjNVUwbx/aUh1nfcuKd8MOLdKIcTFY3jGacSaqL8w0OupdK2ZfWUtl6C7KxR65jMhN90xzh4NjZhzLIFlbSvzf8uJhXMH85y7rfkhDEzqmRBuQqL+h/0AKxYPQArVg/AitV9CzapE+x4kvHfcfkP4Bj4iTNnUszfDW7T5OWVK5Hx1SjPgukG07iuduLs3c9DCFZpwRN6pJP+GErxw8mTmOoEmTnrSM9rBcT0gLn+2osz0MVqLdmsJB4gMlr3loZNCnZLONa7H3SadMPYDmzKwAzrAs5AF2u1pF1JuoWmQ2r+RgEwRxpszsI2JXFJOBTowvYtxfY9D+QZ/JGoXTJY5bVO6hC0jUJtkTbBqtksW9POx9u3YzbMY4u06RaaNiWpQ1B5rTPnnxDs0tVUSVAibUHsCs1K4AR2SY2umkt8yV62bmplQ0sLh48do352Azulxgk0KwGxKyPefGDfXkiUBjZ8A9AsQtAPBFCkZq5h1bM+nmuoAMA0TWqefpMgigiwCAHoUW8esEPnYljx4rtTZP4BwAek0QC43W46WseOqlbc5ufrI/cZNL67vBMO/mRas/OIxY4NNYVTaYVhnR9p5Lbi2sgB2t4dO1z7wxlEKJJ7vhVrWOexq1/M/1V+dWqQ119w0/ikWRCXM3AQZ/Aoi7XAo8GFYIkWEPCTDfhzcTNHLxC4EHi0ZrEWXA4eRVfU5AdTGt75oo/jH83i8UedecHM0GmWa8HnysiV7b3tfnwJOpXBVmnTHTpd2FrZH7Np/jTItVAmb6xhJ6m/oxOLUz0Cw04WvojfGMjyxo4gv1yfeApxGKVD3a6idhc3rSxrPglyuCf+n/XNjR7qqydnMSl62zOUUry3p4+Ne/oYiN05lcyvc5bRiXeBGYYaKMV4pCfOS+29HDwTQ+tJoslJ2bLSneop1W7Fbd7fF+LVbb18dzFBxtYk0+VTCp1JOWbURPckomZTOYl+9adp2X0TAN9gtnywbGJQur3J456HE11lZxuVEgbpMvxpQNvphAOgbm6kpd9p+62wt61csJT3KU4kg8wSKrf+FSoLOCGUysA5cc/P4dCMrcl4xQqlpKcUMJHup+ryhxD/sxQ7Bly0oelfwo2jbs49CP4AAAAASUVORK5CYII=";
     // delay 50ms so that we get proper body dimensions
     setTimeout(load, 50);
 
     function load() {
         const isVaultLocked = getQueryVariable('isVaultLocked') == 'true';
-        if (isVaultLocked) {
-            document.getElementById('logo').src = lockedImage;
-        }
+        document.getElementById('logo').src = isVaultLocked
+            ? chrome.runtime.getURL('images/icon38_locked.png')
+            : chrome.runtime.getURL('images/icon38.png');
+
+        document.getElementById('close').src = chrome.runtime.getURL('images/close.png');
 
         var closeButton = document.getElementById('close-button'),
             body = document.querySelector('body'),