diff --git a/.DS_Store b/.DS_Store
index 5c0ce4f..3360f99 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/notify-link-clicks-i18n/_locales/de/messages.json b/notify-link-clicks-i18n/_locales/de/messages.json
index d282b32..708b995 100644
--- a/notify-link-clicks-i18n/_locales/de/messages.json
+++ b/notify-link-clicks-i18n/_locales/de/messages.json
@@ -15,7 +15,13 @@
   },
 
   "notificationContent": {
-    "message": "Du hast $1 angeklickt",
-    "description": "Tells the user which link they clicked: the $1 placeholder is the url."
+    "message": "Du hast $URL$ angeklickt",
+    "description": "Tells the user which link they clicked.",
+    "placeholders": {
+      "url" : {
+        "content" : "$1",
+        "example" : "https://developer.mozilla.org"
+      }
+    }
   }
 }
diff --git a/notify-link-clicks-i18n/_locales/en/messages.json b/notify-link-clicks-i18n/_locales/en/messages.json
index d0e720b..0f8832d 100644
--- a/notify-link-clicks-i18n/_locales/en/messages.json
+++ b/notify-link-clicks-i18n/_locales/en/messages.json
@@ -15,7 +15,13 @@
   },
 
   "notificationContent": {
-    "message": "You clicked $1.",
-    "description": "Tells the user which link they clicked: the $1 placeholder is the url."
+    "message": "You clicked $URL$.",
+    "description": "Tells the user which link they clicked.",
+    "placeholders": {
+      "url" : {
+        "content" : "$1",
+        "example" : "https://developer.mozilla.org"
+      }
+    }
   }
 }
diff --git a/notify-link-clicks-i18n/_locales/ja/messages.json b/notify-link-clicks-i18n/_locales/ja/messages.json
index e9c1966..de5e783 100644
--- a/notify-link-clicks-i18n/_locales/ja/messages.json
+++ b/notify-link-clicks-i18n/_locales/ja/messages.json
@@ -15,7 +15,13 @@
   },
 
   "notificationContent": {
-    "message": "$1がクリックされました。",
-    "description": "リンクをクリックした時通知を表示します。:変数$1にはurlが代入されます。"
+    "message": "$URL$がクリックされました。",
+    "description": "リンクをクリックした時通知を表示します。:変数$1にはurlが代入されます。",
+    "placeholders": {
+      "url" : {
+        "content" : "$1",
+        "example" : "https://developer.mozilla.org"
+      }
+    }
   }
 }
diff --git a/notify-link-clicks-i18n/_locales/nl/messages.json b/notify-link-clicks-i18n/_locales/nl/messages.json
index 71d2032..dd1f51b 100644
--- a/notify-link-clicks-i18n/_locales/nl/messages.json
+++ b/notify-link-clicks-i18n/_locales/nl/messages.json
@@ -15,7 +15,13 @@
   },
 
   "notificationContent": {
-    "message": "U klikte op $1",
-    "description": "Tells the user which link they clicked: the $1 placeholder is the url."
+    "message": "U klikte op $URL$",
+    "description": "Tells the user which link they clicked.",
+    "placeholders": {
+      "url" : {
+        "content" : "$1",
+        "example" : "https://developer.mozilla.org"
+      }
+    }
   }
 }
diff --git a/notify-link-clicks-i18n/background-script.js b/notify-link-clicks-i18n/background-script.js
index 698fbf1..fad6458 100644
--- a/notify-link-clicks-i18n/background-script.js
+++ b/notify-link-clicks-i18n/background-script.js
@@ -9,7 +9,7 @@ function notify(message) {
   var content = chrome.i18n.getMessage("notificationContent", message.url);
   chrome.notifications.create({
     "type": "basic",
-    "iconUrl": chrome.extension.getURL("icons/__MSG_@@ui_locale__/link-48-__MSG_@@ui_locale__.png"),
+    "iconUrl": chrome.extension.getURL("icons/link-48.png"),
     "title": title,
     "message": content
   });
diff --git a/notify-link-clicks-i18n/icons/de/link-48-de.png b/notify-link-clicks-i18n/icons/de/link-48-de.png
deleted file mode 100644
index 9f39e96..0000000
Binary files a/notify-link-clicks-i18n/icons/de/link-48-de.png and /dev/null differ
diff --git a/notify-link-clicks-i18n/icons/en/link-48-en.png b/notify-link-clicks-i18n/icons/en/link-48-en.png
deleted file mode 100644
index 2effc6f..0000000
Binary files a/notify-link-clicks-i18n/icons/en/link-48-en.png and /dev/null differ
diff --git a/notify-link-clicks-i18n/icons/ja/link-48-ja.png b/notify-link-clicks-i18n/icons/ja/link-48-ja.png
deleted file mode 100644
index 6aebbee..0000000
Binary files a/notify-link-clicks-i18n/icons/ja/link-48-ja.png and /dev/null differ
diff --git a/notify-link-clicks-i18n/icons/nl/link-48-nl.png b/notify-link-clicks-i18n/icons/nl/link-48-nl.png
deleted file mode 100644
index 014b60a..0000000
Binary files a/notify-link-clicks-i18n/icons/nl/link-48-nl.png and /dev/null differ